Update all records + bug fixes

OpenBudget · Sep 18, 2023 · e7979bc · e7979bc
1 parent 6b7d5ad
commit e7979bc
Show file tree

Hide file tree

Showing 12 changed files with 688 additions and 581 deletions.
diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts
@@ -26,6 +26,7 @@ import { AlertTextComponent } from './alert-text/alert-text.component';
 import { ItemProgressLegendComponent } from './social-service-list/item-progress-legend/item-progress-legend.component';
 import { TenderSuppliersEditorComponent } from './social-service-editor/tender-suppliers-editor/tender-suppliers-editor.component';
 import { TenderSurveyControlComponent } from './social-service-editor/tender-survey-control/tender-survey-control.component';
+import { SocialServiceListUpdaterComponent } from './social-service-list-updater/social-service-list-updater.component';
 
 @NgModule({
     declarations: [
@@ -47,6 +48,7 @@ import { TenderSurveyControlComponent } from './social-service-editor/tender-sur
         ItemProgressLegendComponent,
         TenderSuppliersEditorComponent,
         TenderSurveyControlComponent,
+        SocialServiceListUpdaterComponent,
     ],
     imports: [
         BrowserModule,

diff --git a/ui/src/app/obudget-api.service.ts b/ui/src/app/obudget-api.service.ts
@@ -169,6 +169,9 @@ export class ObudgetApiService {
         end_date: end_date || null,
       }
     });
+    if (tenders.length === 0) {
+      return;
+    }
     const body = {service_id, service_name, office, unit, tenders};
     this.syncTendersQueue.next({body, tenders: record.tenders});
   }

diff --git a/ui/src/app/social-service-editor/social-service-editor.component.html b/ui/src/app/social-service-editor/social-service-editor.component.html
@@ -37,19 +37,19 @@
 
 <div class='tab-contents' [class.visible]='tab=="org"'>
     <app-editable-field [record]='datarecord' field='office' label='שם המשרד הממשלתי' kind='enum' [required]='true'
-                        [options]='office_options' (changed)='updateHierarchy(1)'></app-editable-field>
+                        [options]='ssu.office_options' (changed)='ssu.updateHierarchy(1)'></app-editable-field>
     <div class='explanation'>שם המשרד אשר נותן את השירות</div>
-    <ng-container *ngIf='level1_name && level1_options.options.length'>
+    <ng-container *ngIf='ssu.level1_name && ssu.level1_options.options.length'>
         <app-editable-field [record]='datarecord' field='unit' [required]='true'
                             [label]='"שם ה" + level1_name' kind='enum' [options]='level1_options' (changed)='updateHierarchy(2)'></app-editable-field>
         <div class='explanation'>שם ה{{level1_name}} אשר אחראי על מתן השירות</div>
     </ng-container>
-    <ng-container *ngIf='level2_name && level2_options.options.length'>
+    <ng-container *ngIf='ssu.level2_name && ssu.level2_options.options.length'>
         <app-editable-field [record]='datarecord' field='subunit' [required]='true'
                         [label]='"שם ה" + level2_name' kind='enum' [options]='level2_options' (changed)='updateHierarchy(3)'></app-editable-field>
         <div class='explanation'>שם ה{{level2_name}} אשר אחראים למתן השירות</div>
     </ng-container>
-    <ng-container *ngIf='level3_name && level3_options.options.length'>
+    <ng-container *ngIf='ssu.level3_name && ssu.level3_options.options.length'>
         <app-editable-field [record]='datarecord' field='subsubunit' [required]='false'
                             [label]='"שם ה" + level3_name' kind='enum' [options]='level3_options' (changed)='updateHierarchy()'></app-editable-field>
         <div class='explanation'>שם ה{{level3_name}} אשר אחראים למתן השירות</div>
@@ -109,7 +109,7 @@ <h3>תקנות תקציביות</h3>
             </div>
             <h4 class='clickable' (click)='modal("budget")'><i class="fas fa-search"></i>חיפוש והוספה של תקנה תקציבית</h4>
             <div class='explanation'>מספר התקנה התקציבית ממנה ניתן תקציב השירות. על התקנה לכלול 8 ספרות, כולל מספר המשרד</div>
-            <app-editable-table [record]='datarecord' field='budgetItems' [config]='C.budgetItemsConfig' (change)='refresh()'></app-editable-table>
+            <app-editable-table [record]='datarecord' field='budgetItems' [config]='C.budgetItemsConfig' (change)='ssu.refresh()'></app-editable-table>
             <!-- <a class='fill-in' (click)='fillInBudgets()' *ngIf='datarecord.budgetItems && datarecord.budgetItems.length'><i class="fas fa-magic"></i>השלמת תקנות אוטומטית</a>         -->
         </div>
         <div *ngIf='datarecord.manualBudget && datarecord.manualBudget.length'>
@@ -122,7 +122,7 @@ <h3>תקציב השירות</h3>
             </div>
             <app-editable-table [record]='datarecord' field='manualBudget' [config]='C.manualBudgetConfig' (change)='checkBudgetAmounts()'></app-editable-table>
         </div>
-        <div *ngIf='budgetAmounts && budgetAmounts.length'>
+        <div *ngIf='ssu.budgetAmounts && ssu.budgetAmounts.length'>
             <h3>נתונים מספר התקציב</h3>
             <div class='explanation'>
                 תקציב התקנה כפי שמופיע בספר התקציב. אנא בדקו כי תקציב השירות המאושר ותקציב הביצוע בפועל אינם חורגים מתקציב התקנה.
@@ -143,7 +143,7 @@ <h3>מפעילים קשורים</h3>
         <h3>מפעילים <u>לא</u> קשורים</h3>
         <app-editable-table [record]='datarecord' field='non_suppliers' [config]='C.nonSuppliersConfig' (changed)='connectSupplier($event)'></app-editable-table>
     </ng-container>
-    <ng-container *ngIf='possibleSuppliers && possibleSuppliers.length'>
+    <ng-container *ngIf='ssu.possibleSuppliers && ssu.possibleSuppliers.length'>
         <h3>מפעילים אפשריים</h3>
         <app-editable-table [record]='thiz' field='possibleSuppliers' [config]='C.supplierListConfig' (changed)='connectSupplier($event)'></app-editable-table>
     </ng-container>