Merge pull request #276 from codeNaveen1234/Mitra-release-1.0.0

Profile update success toast message issue fix in update profile page

src/app/config/url.config.json

@@ -15,7 +15,7 @@
         "projectCategories": "/project/v1/library/categories/projects/",
         "entityConfigUrl" : "/project/v1/configurations/read",
         "spotlightUrl":"/project/v1/template/list?hasSpotlight=true",
-        "myImprovementsUrl":"/project/v1/userProjects/list",
+        "myImprovementsUrl":"/interface/v1/userProjects/list",
         "recommendationUrl":"",
         "filterUrl": "/project/v1/projectAttributes/find",
         "savedListUrl": "/project/v1/wishlist/list?",

src/app/generic-listing-page/my-improvements-listing/my-improvements-listing.page.ts

@@ -47,11 +47,14 @@ export class MyImprovementsListingPage  {
 
   async getImprovements($event?: any) {
     await this.loaderService.showLoading('LOADER_MSG');
+    let payload={
+      filter : "submittedCount"
+    }
     let url = `${urlConfig.project.myImprovementsUrl}?&page=${this.page}&limit=${this.limit}&search=&status=inProgress`;
-    this.projectsApiService.post(url,{}).subscribe({
+    this.projectsApiService.post(url,payload).subscribe({
       next: async (response: any) => {
         await this.loaderService.dismissLoading();
-        if (response.status == 200) {
+        if (response?.result) {
           this.myImprovements = this.myImprovements.concat(
             response.result.data
           );

src/app/home/home.page.html

@@ -24,7 +24,11 @@
         <div class="create-improvement-card">
           <mat-card >
             <img class="card-image" src="assets/MI-2.0-card-images/recommended-bg.png" alt="Card image" />
-            <h1 class="card-title">{{ "CREATE_YOUR_MI" | translate}}</h1>
+            @if(improvementSubmittedCount > 0){
+              <h1 class="card-title">{{"NO_ONGOING_MICRO_IMPROVEMENTS" | translate}}</h1>
+            }@else{
+              <h1 class="card-title">{{ "CREATE_YOUR_MI" | translate}}</h1>
+            }
             <button class="card-button" (click)="create()">{{ "CREATE_IMPROVEMENT" | translate}}</button>
           </mat-card>
         </div>

src/app/home/home.page.ts

@@ -35,6 +35,7 @@ export class HomePage {
   recommendationCount=0;
   profilePayload:any;
   noData:boolean=false;
+  improvementSubmittedCount=0
 
 
   constructor(private router: Router, private profileService: ProfileService,private translate: TranslateService, private gwApiService: GwApiService) {
@@ -99,8 +100,11 @@ async  getdata() {
     const urls = {
       spotlight: `${urlConfig.project.spotlightUrl}&page=${this.page}&limit=${this.limit}`,
     };
+    let payload={
+      filter : "submittedCount"
+    }
     const fetchDataImprovements = (url:any) =>
-      this.baseApiService.post(url,{}).pipe(
+      this.baseApiService.post(url,payload).pipe(
         catchError((err) => {
           this.toastService.presentToast(err.error.message, 'danger');
           return of({ status: 'error', result: { data: [], count: 0 } });
@@ -122,6 +126,7 @@ async  getdata() {
         map(([improvementRes, spotlightRes]: any) => {
           this.myImprovements = improvementRes.result.data;
           this.improvementsCount = improvementRes.result.count;
+          this.improvementSubmittedCount=improvementRes.result.submittedCount
 
           this.spotlightstories = spotlightRes.result.data;
           this.spotlightCount = spotlightRes.result.count;

src/app/my-journeys-listing/my-journey/my-journey.page.ts

@@ -63,9 +63,11 @@ export class MyJourneyPage  {
     this.noData=true;
     await this.loaderService.showLoading('LOADER_MSG');
     const isInProgress = this.selectedSegment === this.filterActions.inProgress;
-
+    let payload={
+      filter : "submittedCount"
+    }
     const url = `${urlConfig.project.myImprovementsUrl}?&page=${this.page}&limit=${this.limit}&search=&status=${this.selectedSegment}&programId=${this.programId}`;
-    this.projectsApiService.post(url, {}).subscribe({
+    this.projectsApiService.post(url,payload).subscribe({
       next: async (response: any) => {
         await this.loaderService.dismissLoading();
         this.noData=false;

src/app/profile-edit/profile-edit.page.ts

@@ -330,7 +330,7 @@ export class ProfileEditPage implements isDeactivatable {
               this.formLib?.myForm.markAsPristine();
               this.formLib2?.myForm.markAsPristine();
               this.navCtrl.back();
-              this.toastService.presentToast(res?.message || 'PROFILE_UPDATE_SUCCESS', 'success');
+              this.toastService.presentToast('PROFILE_UPDATE_SUCCESS', 'success');
             } else {
               this.toastService.presentToast(res?.message, 'warning');
             }

src/assets/i18n/en.json

@@ -142,5 +142,6 @@
   "MICROPHONE_ACCESS_DENIED":"Microphone access is denied. Please enable it in your browser settings.",
   "VOICE_SEARCH_FAILED":"Voice search failed, please try again",
   "ADD_PHOTO":"ADD PHOTO",
-  "REMOVE_CURRENT_PHOTO":"REMOVE CURRENT PHOTO"
+  "REMOVE_CURRENT_PHOTO":"REMOVE CURRENT PHOTO",
+  "NO_ONGOING_MICRO_IMPROVEMENTS":"No ongoing micro improvements at the moment."
 }

src/assets/i18n/hi.json

@@ -141,6 +141,7 @@
     "MICROPHONE_ACCESS_DENIED":"माइक्रोफोन का उपयोग अस्वीकृत कर दिया गया है। कृपया इसे अपने ब्राउज़र की सेटिंग्स में सक्षम करें।",
     "VOICE_SEARCH_FAILED":"वॉइस सर्च असफल हो गई है, कृपया फिर से प्रयास करें।",
     "ADD_PHOTO":"तस्वीर जोड़ो",
-    "REMOVE_CURRENT_PHOTO":"वर्तमान तस्वीर हटा दें"
+    "REMOVE_CURRENT_PHOTO":"वर्तमान तस्वीर हटा दें",
+    "NO_ONGOING_MICRO_IMPROVEMENTS":"इस समय कोई सूक्ष्म सुधार जारी नहीं है।"
   }