diff --git a/src/components/Observation.vue b/src/components/Observation.vue index 1d519afa77b5714a17bebe543397d4380ddaf683..1e8e99c8a0098f532adc5fad4b4c4f1059ccb7a7 100644 --- a/src/components/Observation.vue +++ b/src/components/Observation.vue @@ -496,38 +496,31 @@ lstPests.push({"pestId": '', "pestName": this.$i18n.t("observation.selectpest")}); } - if (lstPestIds.length === 0) { - lstPests.push({"pestId": -10, "pestName": this.$i18n.t("observation.unregisteredpest")}); - } - else { - let lstPestList = JSON.parse(localStorage.getItem(CommonUtil.CONST_STORAGE_PEST_LIST)); - $.each(lstPestIds, function (index, pestId) { - let jsonDetailPest = lstPestList.find(({organismId}) => organismId === pestId); - let jsonPest = {}; - if (jsonDetailPest) { - let pestName = jsonDetailPest.latinName; - let organismLocaleSet = jsonDetailPest.organismLocaleSet; - - if (organismLocaleSet) { - let strLocale = This.getSystemLocale(); - organismLocaleSet.forEach(localObj => { - if (localObj.organismLocalePK.locale === strLocale) { - if (localObj.localName) { - pestName = localObj.localName; - } - return false; + let lstPestList = JSON.parse(localStorage.getItem(CommonUtil.CONST_STORAGE_PEST_LIST)); + $.each(lstPestIds, function (index, pestId) { + let jsonDetailPest = lstPestList.find(({organismId}) => organismId === pestId); + let jsonPest = {}; + if (jsonDetailPest) { + let pestName = jsonDetailPest.latinName; + let organismLocaleSet = jsonDetailPest.organismLocaleSet; + + if (organismLocaleSet) { + let strLocale = This.getSystemLocale(); + organismLocaleSet.forEach(localObj => { + if (localObj.organismLocalePK.locale === strLocale) { + if (localObj.localName) { + pestName = localObj.localName; } - }); - } - jsonPest = {"pestId": jsonDetailPest.organismId, "pestName": pestName}; - lstPests.push(jsonPest); + return false; + } + }); } - }); - - } - - + jsonPest = {"pestId": jsonDetailPest.organismId, "pestName": pestName}; + lstPests.push(jsonPest); + } + }); + lstPests.push({"pestId": -10, "pestName": this.$i18n.t("observation.unregisteredpest")}); this.pests = lstPests; },