From 5005b3519ef49d983264ca5deddcc4f0019f17a5 Mon Sep 17 00:00:00 2001
From: pshahsancsoft <pshah@sancsoft.com>
Date: Wed, 5 Jun 2024 16:01:04 -0400
Subject: [PATCH 1/2] Added status for loading/saving PM  report tab

---
 package-lock.json                             |  6 +++++
 src/angular/hq/.vscode/settings.json          | 24 +++++++++----------
 .../psr/psrreport/psrreport.component.html    | 21 ++++++++++++++--
 .../app/psr/psrreport/psrreport.component.ts  | 20 ++++++++++++----
 4 files changed, 53 insertions(+), 18 deletions(-)
 create mode 100644 package-lock.json

diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..032ea2f7
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "hq",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}
diff --git a/src/angular/hq/.vscode/settings.json b/src/angular/hq/.vscode/settings.json
index c10ce0e2..961fc01c 100644
--- a/src/angular/hq/.vscode/settings.json
+++ b/src/angular/hq/.vscode/settings.json
@@ -1,13 +1,13 @@
 {
-    "files.associations": {
-        "*.css": "tailwindcss"
-    },
-    "editor.quickSuggestions": {
-        "strings": "on"
-    },
-    "files.watcherExclude": {
-      "**/.git/objects/**": true,
-      "**/.git/subtree-cache/**": true,
-      "**/node_modules/*/**": true
-    }
-}
\ No newline at end of file
+  "files.associations": {
+      ".css": "tailwindcss"
+  },
+  "editor.quickSuggestions": {
+      "strings": "on"
+  },
+  "files.watcherExclude": {
+    "/.git/objects/": true,
+    "/.git/subtree-cache/": true,
+    "**/node_modules//**": true
+  }
+}
diff --git a/src/angular/hq/src/app/psr/psrreport/psrreport.component.html b/src/angular/hq/src/app/psr/psrreport/psrreport.component.html
index 258f68e0..b443ce47 100644
--- a/src/angular/hq/src/app/psr/psrreport/psrreport.component.html
+++ b/src/angular/hq/src/app/psr/psrreport/psrreport.component.html
@@ -1,6 +1,23 @@
 <div class="bg-black-alt border-steel-blue-600 border-t sticky top-0 z-50">
-  <div class="bg-blue-900 border-steel-blue-600 border-y py-3 px-2 text-nowrap flex justify-end">
-    <div class="flex space-x-2 pr-5">
+  <div class="bg-blue-900 border-steel-blue-600 border-y py-3 px-2 text-nowrap flex">
+
+
+    <div class= "ml-5">
+      @if(savedStatus == "loading"){
+        <div class=" rounded min-w-[120px]">
+          <i class ="bi bi-cloud-upload-fill text-3xl text-gray-50"></i>
+        </div>
+        }@else if(savedStatus == "success"){
+        <div>
+          <i class ="bi bi-check-circle-fill text-3xl text-green-400"></i>
+        </div>
+        }@else if(savedStatus == "fail"){
+        <div>
+          <i class ="bi bi-exclamation-diamond-fill text-3xl text-yellow-400"></i>
+        </div>
+      }
+    </div>
+    <div class="ml-auto space-x-2 pr-5">
       <button
         class="px-2 py-2 border border-orange-500 bg-orange-500 hover:bg-orange-600 hover:border-orange-600 text-white rounded min-w-[120px] font-normal"
         (click)="onReportSubmit()">
diff --git a/src/angular/hq/src/app/psr/psrreport/psrreport.component.ts b/src/angular/hq/src/app/psr/psrreport/psrreport.component.ts
index 7698cc01..e85b4710 100644
--- a/src/angular/hq/src/app/psr/psrreport/psrreport.component.ts
+++ b/src/angular/hq/src/app/psr/psrreport/psrreport.component.ts
@@ -12,6 +12,7 @@ import { BrowserModule } from '@angular/platform-browser';
 import { FormsModule, NgModel } from '@angular/forms';
 import { PsrService } from '../psr-service';
 
+
 import {
   BehaviorSubject,
   Observable,
@@ -20,6 +21,7 @@ import {
   combineLatest,
   debounceTime,
   map,
+  tap,
   skip,
   startWith,
   switchMap,
@@ -30,7 +32,6 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { APIError } from '../../errors/apierror';
 import { MarkdownModule } from 'ngx-markdown';
 import { HQMarkdownComponent } from '../../common/markdown/markdown.component';
-
 @Component({
   selector: 'hq-psrreport',
   standalone: true,
@@ -47,6 +48,8 @@ export class PSRReportComponent implements OnInit, OnDestroy {
 
   report$ = new Subject<string | null>();
   psrId$: Observable<string>;
+  savedStatus ="loading";
+
 
   ngOnInit(): void {
     this.psrService.resetFilter();
@@ -54,7 +57,7 @@ export class PSRReportComponent implements OnInit, OnDestroy {
     this.psrService.hideStaffMembers();
     this.psrService.hideIsSubmitted();
   }
-  
+
   ngOnDestroy(): void {
     this.psrService.resetFilter();
     this.destroyed$.next(true);
@@ -65,7 +68,8 @@ export class PSRReportComponent implements OnInit, OnDestroy {
     private hqService: HQService,
     private router: Router,
     private route: ActivatedRoute,
-    private psrService: PsrService
+    private psrService: PsrService,
+
   ) {
     const psrId$ = this.route.parent!.params.pipe(
       map((params) => params['psrId'])
@@ -97,21 +101,28 @@ export class PSRReportComponent implements OnInit, OnDestroy {
       }
     });
 
+
     const apiResponse$ = request$.pipe(
       debounceTime(1000),
       skip(1),
       takeUntil(this.destroyed$),
+      tap(()=> {this.savedStatus = "loading"; console.log(this.savedStatus);}),
       switchMap((request) =>
         this.hqService.updateProjectStatusReportMarkdownV1(request)
       )
     );
     apiResponse$.subscribe({
       next: (response) => {
+        this.savedStatus ="success";
+        console.log(this.savedStatus);
         console.log('API Response:', response);
       },
       error: (err) => {
+        this.savedStatus = "fail";
+        console.log(this.savedStatus);
         console.error('Error:', err);
-        window.alert('There was an error saving the PM report.')
+        window.alert('There was an error saving the PM report.');
+        tap(()=> {this.savedStatus = "fail"; });
       },
     });
   }
@@ -119,6 +130,7 @@ export class PSRReportComponent implements OnInit, OnDestroy {
   updateReport(value: string) {
     this.report$.next(value);
   }
+
   onReportSubmit() {
     if (window.confirm('Are you sure you want to submit this report?')) {
       const request$ = combineLatest({

From 722befbf7629b4038026fc25568211d413546f2d Mon Sep 17 00:00:00 2001
From: Ryan Maffit <rmaffit@sancsoft.com>
Date: Mon, 10 Jun 2024 03:14:37 +0000
Subject: [PATCH 2/2] Tweaked size

---
 .../hq/src/app/psr/psrreport/psrreport.component.html     | 8 ++++----
 .../hq/src/app/psr/psrreport/psrreport.component.ts       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/angular/hq/src/app/psr/psrreport/psrreport.component.html b/src/angular/hq/src/app/psr/psrreport/psrreport.component.html
index 74b687ef..c74d27ac 100644
--- a/src/angular/hq/src/app/psr/psrreport/psrreport.component.html
+++ b/src/angular/hq/src/app/psr/psrreport/psrreport.component.html
@@ -2,18 +2,18 @@
   <div class="bg-blue-900 border-steel-blue-600 border-y py-3 px-2 text-nowrap flex">
 
 
-    <div class= "ml-5">
+    <div class= "ml-5 py-2">
       @if(savedStatus == "loading"){
         <div class=" rounded min-w-[120px]">
-          <i class ="bi bi-cloud-upload-fill text-3xl text-gray-50"></i>
+          <i class ="bi bi-cloud-upload-fill text-gray-50"></i> Saving...
         </div>
         }@else if(savedStatus == "success"){
         <div>
-          <i class ="bi bi-check-circle-fill text-3xl text-green-400"></i>
+          <i class ="bi bi-check-circle-fill text-green-400"></i>
         </div>
         }@else if(savedStatus == "fail"){
         <div>
-          <i class ="bi bi-exclamation-diamond-fill text-3xl text-yellow-400"></i>
+          <i class ="bi bi-exclamation-diamond-fill text-yellow-400"></i> Error saving
         </div>
       }
     </div>
diff --git a/src/angular/hq/src/app/psr/psrreport/psrreport.component.ts b/src/angular/hq/src/app/psr/psrreport/psrreport.component.ts
index ab414f86..110f040d 100644
--- a/src/angular/hq/src/app/psr/psrreport/psrreport.component.ts
+++ b/src/angular/hq/src/app/psr/psrreport/psrreport.component.ts
@@ -48,7 +48,7 @@ export class PSRReportComponent implements OnInit, OnDestroy {
 
   report$ = new Subject<string | null>();
   psrId$: Observable<string>;
-  savedStatus ="loading";
+  savedStatus?: string;
 
 
   ngOnInit(): void {