FEAT #14944 TIME 0:30 add note confirm in process

src/frontend/app/app-common.module.ts

@@ -44,7 +44,7 @@ import { AlertComponent } from '../plugins/modal/alert.component';
 import { ConfirmComponent } from '../plugins/modal/confirm.component';
 
 /*PLUGIN COMPONENT*/
-import { NotesListComponent } from './notes/notes.component';
+import { NotesListComponent } from './notes/notes-list.component';
 import { NoteEditorComponent } from './notes/note-editor.component';
 
 import { PluginAutocomplete } from '../plugins/autocomplete/autocomplete.component';

src/frontend/app/list/panel/panel-list.component.ts

@@ -3,7 +3,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { DiffusionsListComponent } from '../../diffusions/diffusions-list.component';
 import { VisaWorkflowComponent } from '../../visa/visa-workflow.component';
 import { AvisWorkflowComponent } from '../../avis/avis-workflow.component';
-import { NotesListComponent } from '../../notes/notes.component';
+import { NotesListComponent } from '../../notes/notes-list.component';
 import { AttachmentsListComponent } from '../../attachments/attachments-list.component';
 
 declare var $: any;
@@ -15,8 +15,6 @@ declare var $: any;
 })
 export class PanelListComponent implements OnInit {
 
-    
-
     loading: boolean = false;
 
     selectedDiffusionTab: number = 0;

src/frontend/app/notes/note-editor.component.ts

@@ -16,7 +16,6 @@ import { LatinisePipe } from 'ngx-pipes';
 })
 export class NoteEditorComponent implements OnInit {
 
-    
     notes: any;
     loading: boolean = false;
     templatesNote: any = [];
@@ -24,17 +23,17 @@ export class NoteEditorComponent implements OnInit {
 
     entitiesRestriction: string[] = [];
 
-    @Input('title') title: string = this.translate.instant('lang.addNote');
-    @Input('content') content: string = '';
-    @Input('resIds') resIds: any[];
-    @Input('addMode') addMode: boolean;
-    @Input('upMode') upMode: boolean;
-    @Input('noteContent') noteContent: string;
-    @Input('entitiesNoteRestriction') entitiesNoteRestriction: string[];
-    @Input('noteId') noteId: number;
-    @Input('defaultRestriction') defaultRestriction: boolean;
-    @Input('disableRestriction') disableRestriction: boolean = false;
-    @Output('refreshNotes') refreshNotes = new EventEmitter<string>();
+    @Input() title: string = this.translate.instant('lang.addNote');
+    @Input() content: string = '';
+    @Input() resIds: any[];
+    @Input() addMode: boolean;
+    @Input() upMode: boolean;
+    @Input() noteContent: string;
+    @Input() entitiesNoteRestriction: string[];
+    @Input() noteId: number;
+    @Input() defaultRestriction: boolean;
+    @Input() disableRestriction: boolean = false;
+    @Output() refreshNotes = new EventEmitter<string>();
 
     searchTerm: FormControl = new FormControl();
     entitiesList: any[] = [];
@@ -108,7 +107,7 @@ export class NoteEditorComponent implements OnInit {
 
     addNote() {
         this.loading = true;
-        this.http.post("../rest/notes", { value: this.content, resId: this.resIds[0], entities: this.entitiesRestriction })
+        this.http.post('../rest/notes', { value: this.content, resId: this.resIds[0], entities: this.entitiesRestriction })
             .subscribe((data: any) => {
                 this.refreshNotes.emit(this.resIds[0]);
                 this.loading = false;
@@ -117,7 +116,7 @@ export class NoteEditorComponent implements OnInit {
 
     updateNote() {
         this.loading = true;
-        this.http.put("../rest/notes/" + this.noteId, { value: this.content, resId: this.resIds[0], entities: this.entitiesRestriction })
+        this.http.put('../rest/notes/' + this.noteId, { value: this.content, resId: this.resIds[0], entities: this.entitiesRestriction })
             .subscribe((data: any) => {
                 this.refreshNotes.emit(this.resIds[0]);
                 this.loading = false;
@@ -156,7 +155,7 @@ export class NoteEditorComponent implements OnInit {
             if (!this.functions.empty(this.resIds) && this.resIds.length == 1) {
                 params['resId'] = this.resIds[0];
             }
-            this.http.get("../rest/notesTemplates", { params: params })
+            this.http.get('../rest/notesTemplates', { params: params })
                 .subscribe((data: any) => {
                     this.templatesNote = data['templates'];
                 });
@@ -171,7 +170,7 @@ export class NoteEditorComponent implements OnInit {
                 if (!this.functions.empty(this.resIds) && this.resIds.length == 1) {
                     params['resId'] = this.resIds[0];
                 }
-                this.http.get("../rest/entities").pipe(
+                this.http.get('../rest/entities').pipe(
                     tap((data: any) => {
                         this.entities = data['entities'];
                         resolve(true);
@@ -191,4 +190,8 @@ export class NoteEditorComponent implements OnInit {
         this.entities[realIndex].selected = false;
         this.entitiesRestriction.splice(index, 1);
     }
+
+    isWritingNote() {
+        return this.content !== '';
+    }
 }

src/frontend/app/notes/note.module.ts

 import { NgModule } from '@angular/core';
 import { SharedModule } from '../app-common.module';
 
-import { NotesListComponent } from '../notes/notes.component';
+import { NotesListComponent } from './notes-list.component';
 import { NoteEditorComponent } from '../notes/note-editor.component';
 
 @NgModule({

src/frontend/app/notes/notes.component.ts → src/frontend/app/notes/notes-list.component.ts

-import { Component, Input, OnInit, EventEmitter, Output } from '@angular/core';
+import { Component, Input, OnInit, EventEmitter, Output, ViewChild } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { TranslateService } from '@ngx-translate/core';
 import { NotificationService } from '@service/notification/notification.service';
@@ -8,6 +8,7 @@ import { HeaderService } from '@service/header.service';
 import { ConfirmComponent } from '../../plugins/modal/confirm.component';
 import { MatDialogRef, MatDialog } from '@angular/material/dialog';
 import { FunctionsService } from '@service/functions.service';
+import { NoteEditorComponent } from './note-editor.component';
 
 @Component({
     selector: 'app-notes-list',
@@ -16,17 +17,18 @@ import { FunctionsService } from '@service/functions.service';
 })
 export class NotesListComponent implements OnInit {
 
-    
     notes: any[] = [];
     loading: boolean = true;
     resIds: number[] = [];
 
-    @Input('injectDatas') injectDatas: any;
+    @Input() injectDatas: any;
 
-    @Input('resId') resId: number = null;
-    @Input('editMode') editMode: boolean = false;
+    @Input() resId: number = null;
+    @Input() editMode: boolean = false;
 
-    @Output('reloadBadgeNotes') reloadBadgeNotes = new EventEmitter<string>();
+    @Output() reloadBadgeNotes = new EventEmitter<string>();
+
+    @ViewChild('noteEditor', { static: false }) noteEditor: NoteEditorComponent;
 
     dialogRef: MatDialogRef<any>;
 
@@ -58,7 +60,7 @@ export class NotesListComponent implements OnInit {
     loadNotes(resId: number) {
         this.resIds[0] = resId;
         this.loading = true;
-        this.http.get("../rest/resources/" + this.resIds[0] + "/notes")
+        this.http.get('../rest/resources/' + this.resIds[0] + '/notes')
             .subscribe((data: any) => {
                 this.notes = data['notes'];
                 this.reloadBadgeNotes.emit(`${this.notes.length}`);
@@ -80,7 +82,7 @@ export class NotesListComponent implements OnInit {
             filter((data: string) => data === 'ok'),
             exhaustMap(() => this.http.request('DELETE', '../rest/notes/' + note.id)),
             tap(() => {
-                var index = this.notes.findIndex(elem => elem.id == note.id)
+                const index = this.notes.findIndex(elem => elem.id == note.id);
                 if (index > -1) {
                     this.notes.splice(index, 1);
                 }
@@ -97,4 +99,12 @@ export class NotesListComponent implements OnInit {
             note.edit = false;
         }
     }
+
+    isModified() {
+        return this.noteEditor === undefined || this.noteEditor.isWritingNote();
+    }
+
+    addNote() {
+        this.noteEditor.addNote();
+    }
 }

src/frontend/app/process/process.component.ts

@@ -27,6 +27,7 @@ import { FunctionsService } from '@service/functions.service';
 import { PrintedFolderModalComponent } from '../printedFolder/printed-folder-modal.component';
 import { of, Subscription } from 'rxjs';
 import { TechnicalInformationComponent } from '@appRoot/indexation/technical-information/technical-information.component';
+import { NotesListComponent } from '@appRoot/notes/notes-list.component';
 
 
 @Component({
@@ -150,6 +151,7 @@ export class ProcessComponent implements OnInit, OnDestroy {
     @ViewChild('appDiffusionsList', { static: false }) appDiffusionsList: DiffusionsListComponent;
     @ViewChild('appVisaWorkflow', { static: false }) appVisaWorkflow: VisaWorkflowComponent;
     @ViewChild('appAvisWorkflow', { static: false }) appAvisWorkflow: AvisWorkflowComponent;
+    @ViewChild('appNotesList', { static: false }) appNotesList: NotesListComponent;
     senderLightInfo: any = { 'displayName': null, 'fillingRate': null };
     hasContact: boolean = false;
 
@@ -767,6 +769,8 @@ export class ProcessComponent implements OnInit, OnDestroy {
             return true;
         } else if (this.currentTool === 'opinionCircuit' && this.appAvisWorkflow !== undefined && this.appAvisWorkflow.isModified()) {
             return true;
+        } else if (this.currentTool === 'notes' && this.appNotesList !== undefined && this.appNotesList.isModified()) {
+            return true;
         } else {
             return false;
         }
@@ -795,6 +799,8 @@ export class ProcessComponent implements OnInit, OnDestroy {
         } else if (this.currentTool === 'opinionCircuit' && this.appAvisWorkflow !== undefined) {
             await this.appAvisWorkflow.saveAvisWorkflow();
             this.loadBadges();
+        } else if (this.currentTool === 'notes' && this.appNotesList !== undefined) {
+            this.appNotesList.addNote();
         }
     }