Merge pull request #111 from ramkumar-pacewisdom/dev-ram0

Dev ram0
ELEVATE-Project · Jul 23, 2024 · e40bb00 · e40bb00
2 parents 29aa51a + 3d798e7
commit e40bb00
Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/projects/lib-project/src/lib/dock/components/tasks/tasks.component.ts b/projects/lib-project/src/lib/dock/components/tasks/tasks.component.ts
@@ -109,7 +109,7 @@ export class TasksComponent implements OnInit,OnDestroy {
         }
         else {
           this.libProjectService
-          .createOrUpdateProject({title:'Untitled project'})
+          .createOrUpdateProject({...this.libProjectService.projectData,...{title:'Untitled project'}})
           .subscribe((res: any) => {
             (this.projectId = res.result.id),
               this.router.navigate([], {

diff --git a/projects/lib-project/src/lib/dock/view-module/layout/layout.component.ts b/projects/lib-project/src/lib/dock/view-module/layout/layout.component.ts
@@ -91,6 +91,8 @@ export class LayoutComponent {
           });
           dialogRef.afterClosed().subscribe(result => {
             if(result.sendForReview == "SEND_FOR_REVIEW"){
+              this.libProjectService
+              .createOrUpdateProject(this.libProjectService.projectData).subscribe((res) => {
               this.route.queryParams.subscribe((params: any) => {
                 if (params.projectId) {
                   const reviewer_ids = (result.selectedValues.length === list.result.data.length)? {} : { "reviewer_ids" : result.selectedValues.map((item:any) => item.id) } ;
@@ -99,11 +101,12 @@ export class LayoutComponent {
                   })
                 }
               })
+            })
             }
             return true;
           });
-        })  
-        break; 
+        })
+        break;
       default:
             break;
     }

diff --git a/projects/lib-project/src/lib/lib-project.service.ts b/projects/lib-project/src/lib/lib-project.service.ts
@@ -56,6 +56,12 @@ export class LibProjectService {
 
   createOrUpdateProject(projectData?:any,projectId?:string|number) {
     this.projectData.title = this.projectData?.title?.length > 0 ? this.projectData.title :'Untitled project';
+    for (let key in projectData) {
+      if(Array.isArray(projectData[key])) {
+        projectData[key] = projectData[key].map((element:any) =>  element.value ? element.value : element)
+      }
+      projectData[key]= projectData[key]?.value ? projectData[key].value : projectData[key];
+    }
     const config = {
       url: projectId ? this.Configuration.urlConFig.PROJECT_URLS.CREATE_OR_UPDATE_PROJECT+'/'+projectId : this.Configuration.urlConFig.PROJECT_URLS.CREATE_OR_UPDATE_PROJECT,
       payload: projectData ? projectData : ''