KAAV-1473 vis timeline to show correct symbols on timeline when savin…

…g luonnos phase
City-of-Helsinki · Aug 27, 2024 · bc21d2f · bc21d2f
1 parent 3e07b32
commit bc21d2f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/components/ProjectTimeline/VisTimelineGroup.js b/src/components/ProjectTimeline/VisTimelineGroup.js
@@ -262,7 +262,6 @@ const VisTimelineGroup = forwardRef(({ groups, items, deadlines, visValues, dead
             if(key.includes("kaavaluonnos_lautakuntaan_") || key.includes("jarjestetaan_luonnos_esillaolo_") || key.includes("periaatteet_lautakuntaan_") || key.includes("jarjestetaan_periaatteet_esillaolo_")){
               deleteValue = false
             }
-            console.log("dispatch",key,deleteValue)
             dispatch(change(EDIT_PROJECT_TIMETABLE_FORM, key, deleteValue));
           }
         }

diff --git a/src/components/input/DeadlineInput.js b/src/components/input/DeadlineInput.js
@@ -50,13 +50,18 @@ const DeadLineInput = ({
     inputValue = ''
   }
   let currentDeadlineDate = ''
+  const index = input.name.match(/\d+/);
+  const indexString = index ? "_"+index[0] : '';
 
   if(currentDeadline?.deadline?.attribute && attributeData[currentDeadline.deadline.attribute]){
     currentDeadlineDate = attributeData[currentDeadline.deadline.attribute]
   }
   else if(input.name === 'ehdotus_nahtaville_aineiston_maaraaika' && attributeData['ehdotus_kylk_aineiston_maaraaika']){
     inputValue = attributeData['ehdotus_kylk_aineiston_maaraaika']
   }
+  else if(input.name === 'luonnosaineiston_maaraaika'+indexString && attributeData['kaavaluonnos_kylk_aineiston_maaraaika'+indexString]){
+    inputValue = attributeData['kaavaluonnos_kylk_aineiston_maaraaika'+indexString]
+  }
   else if (currentDeadline?.date) {
     currentDeadlineDate = currentDeadline.date
   }

diff --git a/src/components/project/EditProjectTimetableModal/index.js b/src/components/project/EditProjectTimetableModal/index.js
@@ -601,7 +601,7 @@ class EditProjectTimeTableModal extends Component {
       const groups = this.state.groups.get();
       let className = "";
       let matchingValues = Object.entries(this.props.formValues);
-    
+
       // Iterate over the keys
       for (let key of keys) {
         // Split the key into an array of substrings
@@ -704,6 +704,7 @@ class EditProjectTimeTableModal extends Component {
             key === 'milloin_' + phase + '_' + content + '_paattyy' + indexKey ||
             key === 'milloin_' + syntaxToCheck + '_' + filterContent + '_paattyy' + indexKey ||
             key === phase + '_kylk_aineiston_maaraaika' + indexKey ||
+            key === "kaava"+phase + '_kylk_aineiston_maaraaika' + indexKey ||
             key === phase + '_nahtaville_aineiston_maaraaika' + indexKey ||
             key === phase + '_esillaolo_aineiston_maaraaika' + indexKey ||
             key === phase + '_kylk_maaraaika' + indexKey ||
@@ -782,7 +783,7 @@ class EditProjectTimeTableModal extends Component {
                 locked: false,
                 phase: false,
                 phaseID: groupID,
-                start: validValues[2].value,
+                start: phase === "luonnos" ? validValues[3].value : validValues[2].value,
                 end: validValues[0].value,
                 title: "divider"
               }