Merge pull request #100 from Prometheus7-creator/main

sequenceNumber changed to sequenceNo
abhinovpankaj · Dec 9, 2023 · 5a06c93 · 5a06c93
2 parents 8500ca9 + 6cc6f21
commit 5a06c93
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/routes/location-endpoint.js b/routes/location-endpoint.js
@@ -17,7 +17,7 @@ router.route('/add')
 try{
 var errResponse;
 // Get user input
-const { name, description, createdBy,url,parentid,parenttype,type,isInvasive, sequenceNumber} = req.body;
+const { name, description, createdBy,url,parentid,parenttype,type,isInvasive, sequenceNo} = req.body;
 
 // Validate user input
 if (!(name&&parentid)) {
@@ -40,7 +40,7 @@ try{
       "lasteditedBy":createdBy,
       "editedat":creationtime,
       "isInvasive":isInvasive,
-      "sequenceNumber": sequenceNumber
+      "sequenceNo": sequenceNo
   }
 }catch(ex){
   console.log(ex);

diff --git a/routes/subproject-endpoint.js b/routes/subproject-endpoint.js
@@ -34,7 +34,7 @@ router.route('/add')
 try{
 var errResponse;
 // Get user input
-const { name, description, parentid,parenttype,isInvasive,url,assignedTo,createdBy, sequenceNumber } = req.body;
+const { name, description, parentid,parenttype,isInvasive,url,assignedTo,createdBy, sequenceNo } = req.body;
 
 // Validate user input
 if (!(name&&parentid)) {
@@ -67,7 +67,7 @@ try{
       "lasteditedby":createdBy,
       "children":[],
       "isInvasive": isInvasive,
-      "sequenceNumber": sequenceNumber
+      "sequenceNo": sequenceNo
     } 
 }catch(ex){
   console.log(ex);

diff --git a/service/projectmetadata/getProjectMetaData.js b/service/projectmetadata/getProjectMetaData.js
@@ -99,7 +99,7 @@ async function getSubProjectsData(projectId) {
             subProjectData._id = subProject._id;
             subProjectData.name = subProject.name;
             subProjectData.isInvasive = subProject.isInvasive?subProject.isInvasive:false;
-            subProjectData.sequenceNumber = subProject.sequenceNumber;
+            subProjectData.sequenceNo = subProject.sequenceNo;
             const subProjectLocations = [];
             const subProjectChildren = await location.getLocationByParentId(subProject._id);
 
@@ -108,22 +108,22 @@ async function getSubProjectsData(projectId) {
                     const locId = loc._id;
                     const locName = loc.name;
                     const locType = loc.type;
-                    const sequenceNumber = loc.sequenceNumber;
+                    const sequenceNo = loc.sequenceNo;
                     const isInvasive = loc.isInvasive?loc.isInvasive:false;
-                    subProjectLocations.push({ locationId: locId, sequenceNumber:sequenceNumber, locationName: locName,
+                    subProjectLocations.push({ locationId: locId, sequenceNo:sequenceNo, locationName: locName,
                          locationType: locType,isInvasive:isInvasive });
                 }
             }
             subProjectData.subProjectLocations = subProjectLocations
             .sort(function(subProj1,subProj2){
-                return (subProj1.sequenceNumber-subProj2.sequenceNumber)
+                return (subProj1.sequenceNo-subProj2.sequenceNo)
             });
             subProjects.push(subProjectData);
 
         }
     }
     subProjects.sort(function(subProj1,subProj2){
-        return (subProj1.sequenceNumber-subProj2.sequenceNumber)
+        return (subProj1.sequenceNo-subProj2.sequenceNo)
     });
     return subProjects;
 }

diff --git a/service/reportstrategy/reportGeneration.js b/service/reportstrategy/reportGeneration.js
@@ -144,10 +144,10 @@ class ReportGeneration{
             }
         }
         subProjects.sort(function(subProj1,subProj2){
-            return (subProj1.sequenceNumber-subProj2.sequenceNumber);
+            return (subProj1.sequenceNo-subProj2.sequenceNo);
         });
         locations.sort(function(loc1,loc2){
-            return (loc1.sequenceNumber-loc2.sequenceNumber);
+            return (loc1.sequenceNo-loc2.sequenceNo);
         });
         orderedProjects.push(...subProjects);
         orderedProjects.push(...locations);

diff --git a/service/subprojectreportgeneration.js b/service/subprojectreportgeneration.js
@@ -68,10 +68,10 @@ const reordersubProjectLocations = function(locations){
         }
     }
     subProjectApartments.sort(function(apt1,apt2){
-            return (apt1.sequenceNumber-apt2.sequenceNumber);
+            return (apt1.sequenceNo-apt2.sequenceNo);
         });
     subProjectLocations.sort(function(loc1,loc2){
-                return (loc1.sequenceNumber-loc2.sequenceNumber)});
+                return (loc1.sequenceNo-loc2.sequenceNo)});
     orderedlocationsInSubProjects.push(...subProjectApartments);
     orderedlocationsInSubProjects.push(...subProjectLocations);
     return orderedlocationsInSubProjects;

diff --git a/service/updateParentHelper.js b/service/updateParentHelper.js
@@ -9,7 +9,7 @@ const addLocationMetadataInParent = async (locationId, location) => {
     url: location.url,
     description: location.description,
     isInvasive: location.isInvasive ? location.isInvasive : false,
-    sequenceNumber: location.sequenceNumber !== undefined ? location.sequenceNumber : null,
+    sequenceNo: location.sequenceNo !== undefined ? location.sequenceNo : null,
   };
 
   if (location.parenttype == "subproject") {
@@ -68,7 +68,7 @@ const addSectionMetadataInParent = async (sectionId, section) => {
     visualsignsofleak: section.visualsignsofleak,
     isuploading: false,
     count: section.images.length,
-    sequenceNumber: section.sequenceNumber !== undefined ? section.sequenceNumber : null,
+    sequenceNo: section.sequenceNo !== undefined ? section.sequenceNo : null,
   };
 
   if (section.parenttype == "project") {
@@ -116,7 +116,7 @@ const addSubprojectMetaDataInProject = async (subProjectId, subProject) => {
     url: subProject.url,
     description: subProject.description,
     isInvasive: subProject.isInvasive,
-    sequenceNumber: subProject.sequenceNumber !== undefined ? subProject.sequenceNumber : null,
+    sequenceNo: subProject.sequenceNo !== undefined ? subProject.sequenceNo : null,
   };
   await ProjectDAO.addProjectChild(
     subProject.parentid,