Merge branch 'master' into rfontanarosa/1960/survey-list-clicking-a-s…

…urvey-brings-user-to-the-survey-edit-screen
google · Aug 20, 2024 · 7fc6730 · 7fc6730
2 parents a97806c + 5095678
commit 7fc6730
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/web/src/app/converters/loi-data-converter.ts b/web/src/app/converters/loi-data-converter.ts
@@ -64,7 +64,7 @@ function propertiesPbToModel(pb: {
   [k: string]: Pb.LocationOfInterest.IProperty;
 }): Map<string, string | number> {
   const properties: {[k: string]: string | number} = {};
-  for (const k in pb.keys) {
+  for (const k of Object.keys(pb)) {
     const v = pb[k].stringValue || pb[k].numericValue;
     if (v !== null && v !== undefined) {
       properties[k] = v;

diff --git a/...container/main-page/secondary-side-panel/submission-panel/submission-panel.component.html b/...container/main-page/secondary-side-panel/submission-panel/submission-panel.component.html
@@ -45,8 +45,8 @@
                 {{option.label}}
               </mat-checkbox>
 
-              <mat-checkbox disabled="true" checked="true" *ngIf="getTaskMultipleChoiceSelections(task).otherOption">
-                Other: {{option.label}}
+              <mat-checkbox disabled="true" checked="true" *ngIf="getTaskMultipleChoiceSelections(task).otherValue as otherValue">
+                Other: {{otherValue}}
               </mat-checkbox>
             </div>
             <!-- Photo task types -->