Merge pull request #186 from scholarsportal/nana-dev

fix weighting issues, alphabetized group list

Author: nana-boateng

src/app/components/body/variables/data/table-menu/table-menu.component.html

@@ -96,9 +96,12 @@ <h2 class="sr-only">{{ 'TABLE_MENU.VAR_TABLE_OPTS' | translate }}</h2>
         name="assign-weight"
         [disabled]="variablesSelected()"
       >
-        <option disabled hidden selected value="">
+        <option disabled hidden selected [value]="''">
           {{ 'TABLE_MENU.ASSIGN_WEIGHT' | translate }}
         </option>
+        <option [value]="''">
+          {{ 'TABLE_MENU.NO_CHANGE' | translate }}
+        </option>
         <option [value]="'remove'">
           {{ 'TABLE_MENU.REMOVE_WEIGHT' | translate }}
         </option>

src/app/components/body/variables/data/table/modal/edit/edit.component.ts

@@ -51,10 +51,15 @@ export class EditComponent {
   }>();
   allGroups = input.required<{ [groupID: string]: VariableGroup }>();
   allGroupsArray = computed(() => {
-    return Object.keys(this.allGroups());
+    const groups = Object.keys(this.allGroups());
+    const alphabetizedGroups = groups.sort((a, b) => {
+      const labelA = this.allGroups()[a].labl;
+      const labelB = this.allGroups()[b].labl;
+      return labelA.localeCompare(labelB);
+    });
+    return alphabetizedGroups;
   });
   decodedVariableGroups = computed(() => {
-    // console.log(this.variableGroups());
     const varGroups: string[] = [];
     Object.values(this.allGroups()).map((group) => {
       varGroups.push(group.labl);

src/app/new.state/xml/xml.util.ts

@@ -125,37 +125,37 @@ export function changeWeightForSelectedVariables(
   Object.keys(frequencyTableForSelectedVariables).forEach((variableID) => {
     if (duplicateVariables[variableID]) {
       const currentCategories = duplicateVariables[variableID].catgry;
+      console.log('Weight ID: ', !!weightID);
       if (currentCategories && Array.isArray(currentCategories)) {
         currentCategories.map((category) => {
           if (Array.isArray(category.catStat)) {
             category.catStat = [
               category.catStat[0],
               {
                 '#text':
-                  weightID.length && weightID !== 'remove'
+                  weightID !== 'remove'
                     ? frequencyTableForSelectedVariables[variableID][
                         category.catValu
                       ] || 0
                     : 0,
                 '@_type': 'freq',
                 '@_wgtd': 'wgtd',
-                '@_wgt-var': weightID,
+                '@_wgt-var': weightID !== 'remove' ? weightID : '',
               },
             ];
           } else {
             category.catStat = [
               category.catStat,
               {
                 '#text':
-                  weightID.length && weightID !== 'remove'
+                  weightID !== 'remove'
                     ? frequencyTableForSelectedVariables[variableID][
                         category.catValu
                       ] || 0
                     : 0,
                 '@_type': 'freq',
                 '@_wgtd': 'wgtd',
-                '@_wgt-var':
-                  weightID.length && weightID !== 'remove' ? weightID : '',
+                '@_wgt-var': weightID !== 'remove' ? weightID : '',
               },
             ];
           }
@@ -221,7 +221,7 @@ export function changeAssignedWeightForMultipleVariables(
     updatedVariableList.push(tempVar);
   });
 
-  return updatedVariableList;
+  return assignedWeight.length ? updatedVariableList : allVariablesArray;
 }
 
 export function changeSingleVariable(

src/assets/i18n/en-CA.json

@@ -75,6 +75,7 @@
     "DATASET_CITATION": "Dataset Citation",
     "FETCHING_WEIGHT": "Fetching weight data from Dataverse",
     "FETCHING_WEIGHT_FAILED": "Failed to fetch weight data from Dataverse",
+    "DATASET_SAVING": "Dataset saving",
     "DATASET_SAVED": "Dataset saved",
     "DATASET_UPLOADING": "Dataset uploading to Dataverse",
     "DATASET_UPLOADED": "Dataset uploaded to Dataverse",

src/assets/i18n/fr-CA.json

@@ -75,6 +75,7 @@
     "DATASET_CITATION": "Citer l'ensemble de données",
     "FETCHING_WEIGHT": "Récupération des données de poids depuis Dataverse",
     "FETCHING_WEIGHT_FAILED": "Échec de la récupération des données de poids depuis Dataverse",
+    "DATASET_SAVING": "Sauvegarde de l'ensemble de données",
     "DATASET_SAVED": "Ensemble de données sauvegardé",
     "DATASET_UPLOADING": "Téléversement de l'ensemble de données",
     "DATASET_UPLOADED": "Ensemble de données téléversé",
@@ -158,6 +159,7 @@
   },
   "TABLE_MENU": {
     "ASSIGN_WEIGHT": "Assigner un poids",
+    "NO_CHANGE": "Laisser le poids tel quel",
     "NO_GROUP": "Aucune option de groupe ou poids sélectionné",
     "VAR_TABLE_OPTS": "Options du tableau de variables",
     "ADD_SELECTED": "Ajouter les variables sélectionnées au groupe",