forked from enviPath/enviPy
...
This commit is contained in:
@ -5,11 +5,11 @@
|
|||||||
class="modal"
|
class="modal"
|
||||||
x-data="{
|
x-data="{
|
||||||
isSubmitting: false,
|
isSubmitting: false,
|
||||||
packageClassification: null,
|
packageClassification: '',
|
||||||
|
|
||||||
reset() {
|
reset() {
|
||||||
this.isSubmitting = false;
|
this.isSubmitting = false;
|
||||||
this.packageClassification = null;
|
this.packageClassification = '';
|
||||||
},
|
},
|
||||||
|
|
||||||
setFormData(data) {
|
setFormData(data) {
|
||||||
@ -114,7 +114,7 @@
|
|||||||
x-model="packageClassification"
|
x-model="packageClassification"
|
||||||
required
|
required
|
||||||
>
|
>
|
||||||
<option value="null" disabled selected>Select Classification</option>
|
<option value="" disabled>Select Classification</option>
|
||||||
<option value="0">Internal</option>
|
<option value="0">Internal</option>
|
||||||
<option value="10">Restricted</option>
|
<option value="10">Restricted</option>
|
||||||
<option value="20">Secret</option>
|
<option value="20">Secret</option>
|
||||||
|
|||||||
@ -56,7 +56,7 @@ def get_pathway_for_iuclid_export(user, pathway_uuid: UUID) -> PathwayExportDTO:
|
|||||||
|
|
||||||
ai_for_node = []
|
ai_for_node = []
|
||||||
scenario_entries: list[PathwayScenarioDTO] = []
|
scenario_entries: list[PathwayScenarioDTO] = []
|
||||||
for scenario in sorted(node.scenarios.all(), key=lambda item: item.pk):
|
for scenario in sorted(node.get_scenarios(), key=lambda item: item.pk):
|
||||||
ai_for_scenario = list(scenario.get_additional_information(direct_only=True))
|
ai_for_scenario = list(scenario.get_additional_information(direct_only=True))
|
||||||
ai_for_node.extend(ai_for_scenario)
|
ai_for_node.extend(ai_for_scenario)
|
||||||
scenario_entries.append(
|
scenario_entries.append(
|
||||||
|
|||||||
@ -351,7 +351,8 @@ class PathwayMapper:
|
|||||||
|
|
||||||
props = SoilPropertiesData()
|
props = SoilPropertiesData()
|
||||||
|
|
||||||
for ai in ai_list:
|
for ai_obj in ai_list:
|
||||||
|
ai = ai_obj.get()
|
||||||
if isinstance(ai, SoilTexture1) and props.soil_type is None:
|
if isinstance(ai, SoilTexture1) and props.soil_type is None:
|
||||||
props.soil_type = ai.type.value
|
props.soil_type = ai.type.value
|
||||||
elif isinstance(ai, SoilTexture2):
|
elif isinstance(ai, SoilTexture2):
|
||||||
|
|||||||
Reference in New Issue
Block a user