Small style fixes and improvements

OpenBudget · Jan 29, 2024 · 2e03b71 · 2e03b71
1 parent 231b5e0
commit 2e03b71
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/projects/budgetkey/src/app/common-components/auth/auth.component.less b/projects/budgetkey/src/app/common-components/auth/auth.component.less
@@ -46,7 +46,7 @@
     background-color: #FFFFFF;
     box-shadow: 0 2px 10px 0 rgba(0,0,0,0.1);
     display: none;
-    z-index: 100;
+    z-index: 101;
 }
 
 .widget:hover .menu, .widget:focus-within .menu {

diff --git a/projects/budgetkey/src/app/common-components/services/lists.service.ts b/projects/budgetkey/src/app/common-components/services/lists.service.ts
@@ -72,7 +72,7 @@ export class ListsService {
     const itemIds: any = {};
     lists.forEach((list) => {
       list.items?.forEach((item) => {
-        const doc_id = item.properties?.source.doc_id;
+        const doc_id = item.properties?.source?.doc_id;
         if (doc_id) {
           itemIds[doc_id] = true;
         }

diff --git a/...budgetkey/src/app/item/items/item-budget/base-budget-item/base-budget-item.component.html b/...budgetkey/src/app/item/items/item-budget/base-budget-item/base-budget-item.component.html
@@ -31,6 +31,16 @@
       זוהי תקנת {{item.direction?.[0]}} המשמשת לצורך {{item['nice-econ-category']}}.
     </ng-container>
 
+    <ng-container *ngIf='!!item.gross_allocated || !!item.gross_revised'>
+      <br />
+      בנוסף, קיימת בסעיף זה הוצאה המונתית בהכנסה בסך של ₪{{ format.number(item.gross_revised || item.gross_allocated) }}.  
+    </ng-container>
+
+    <ng-container *ngIf='!!item.commitment_allowance_allocated || !!item.commitment_allowance_revised'>
+      <br />
+     בסעיף זה קיימת הרשאה להתחייב על סכום של ₪{{ format.number(item.commitment_allowance_revised || item.commitment_allowance_allocated) }}.
+    </ng-container>
+
     <br />
     <ng-container *ngIf='item.covid19_expenses_revised > 0'>
       <strong>
@@ -62,16 +72,16 @@
       <br />
     </ng-container>
 
-    <ng-container *ngIf='!!item.personnel_allocated || !!item.contractors_allocated'>
+    <ng-container *ngIf='!!item.personnel_allocated || !!item.contractors_allocated || !!item.personnel_revised || !!item.contractors_revised'>
       תחת סעיף זה מוקצים
-      <ng-container *ngIf='item.personnel_allocated > 0'>
-        {{ format.number(item.personnel_allocated) }} תקני כח אדם
+      <ng-container *ngIf='!!item.personnel_allocated || !!item.personnel_revised'>
+        {{ format.number(item.personnel_revised || item.personnel_allocated) }} תקני כח אדם
       </ng-container>
-      <ng-container *ngIf='item.personnel_allocated > 0 && item.contractors_allocated > 0'>
+      <ng-container *ngIf='(!!item.personnel_allocated || !!item.personnel_revised) && (!!item.contractors_allocated || !!item.contractors_revised)'>
         , ובנוסף
       </ng-container>
-      <ng-container *ngIf='item.contractors_allocated > 0'>
-        {{ format.number(item.contractors_allocated) }} חודשי עבודה בלתי צמיתה (יועצים וקבלנים)
+      <ng-container *ngIf='!!item.contractors_allocated || !!item.contractors_revised'>
+        {{ format.number(item.contractors_revised || item.contractors_allocated)}} חודשי עבודה בלתי צמיתה (יועצים וקבלנים)
       </ng-container>
       <br />
     </ng-container>

diff --git a/projects/budgetkey/src/app/list-components/list-view/list-view.component.html b/projects/budgetkey/src/app/list-components/list-view/list-view.component.html
@@ -34,12 +34,14 @@ <h1 [editedContent]='editable()' (updated)='title = $event' #titleEl>{{title}}</
 <div class='list-contents'>
     <div class='list-contents-results'>
         <ng-container  *ngFor='let item of list.items; let i = index'>
-            <search-result [item]="item.properties" [index]="i" [kind]="item.properties.type" 
-                [bare]='false'
-                [showNotes]='true' [notes]='item.properties.__notes' [editableNotes]='editable()'
-                (updatedNotes)='updateNotes(item, $event)'
-                *ngIf='item.properties'
-            ></search-result>
+            <ng-container *ngIf='item.properties?.source'>
+                <search-result [item]="item.properties" [index]="i" [kind]="item.properties.type" 
+                    [bare]='false'
+                    [showNotes]='true' [notes]='item.properties.__notes' [editableNotes]='editable()'
+                    (updatedNotes)='updateNotes(item, $event)'
+                    *ngIf='item.properties'
+                ></search-result>
+            </ng-container>
         </ng-container>        
     </div>
     <div class='share'>