+ AAAAA {{modalTitle[taskType]}}
@@ -19,101 +20,109 @@
- -
-
-
- -
-
- - Normal (4 dias para a execução da tarefa) - Urgente (2 dias para a execução da tarefa) - Muito Urgente (1 dia para a execução da tarefa) - Urgentíssimo (8 horas para a execução da tarefa) - -
-
-
-
-
-
- -
-
- - {{type.Description}} - -
-
-
- -
-
-
- -
-
-
- - - Adicionar intervenientes - {{participant.Name}} - - + +
+ +
+
+
+
-
- +
+ + Normal (4 dias para a execução da tarefa) + Urgente (2 dias para a execução da tarefa) + Muito Urgente (1 dia para a execução da tarefa) + Urgentíssimo (8 horas para a execução da tarefa) +
-
- -
-
-
- -
-
-
- - - Com conhecimento - {{participant.Name}} - - +
+
+
+
-
- +
+ + {{type.Description}} +
-
- diff --git a/src/app/modals/create-process/create-process.page.scss b/src/app/modals/create-process/create-process.page.scss index 3fa3f3254..6d725b128 100644 --- a/src/app/modals/create-process/create-process.page.scss +++ b/src/app/modals/create-process/create-process.page.scss @@ -125,4 +125,64 @@ .aside-content{ display: block; } - } \ No newline at end of file + } + + + + +.close-button { + display: none; +} + + +.list:hover { + + .app-name { + display: none; + } + + .close-button { + display: block !important; + } +} + + +.app-name{ + background: #42b9f2; + border-radius: 18px; + text-align: center; + display: flex; + align-items: center; + padding: 0px 5px; + color: white; + font-size: 9pt; + font-weight: 500; + height: 19px; + -webkit-border-radius: 18px; + -moz-border-radius: 18px; + -ms-border-radius: 18px; + -o-border-radius: 18px; +} + + + +.attach-icon{ + width: 37px; + font-size: 35px; + float: left; +} +.attach-title-item{ + width: 100%; + font-size: 15px; + color:#0d89d1; +} +/* SPAN */ +.span-left{ + float: left; + font-size: 15x; +} +.span-right{ +text-align: right; +float: right; +font-size: 13px; +} diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index c64c16d60..4e37ec6f4 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -14,6 +14,8 @@ import { AddParticipantsModalPage } from 'src/app/pages/gabinete-digital/expedie import { AddParticipantsCcModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page'; import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'; +import { SearchDocument } from 'src/app/models/search-document'; +import { SearchPage } from 'src/app/pages/search/search.page'; @Component({ selector: 'app-create-process', @@ -52,6 +54,8 @@ export class CreateProcessPage implements OnInit { emptyTextDescription = "Sem intervenientes selecionados"; showEmptyContainer = true; + documents:SearchDocument[] = []; + constructor( private modalController: ModalController, private router:Router, @@ -85,7 +89,7 @@ export class CreateProcessPage implements OnInit { /* By Default TypeDeadline should be 'Normal' */ this.postData.Priority = '99999861'; /* By Default TypeDeadline should be 'Economia' */ - this.postData.SubjectTypeId = '99999844'; + this.postData.SubjectTypes = [99999844]; /* Initialize 'Subject' with the title of the expedient */ this.postData.DispatchFolder.Subject = this.task.workflowInstanceDataFields.Subject; this.profile = this.navParams.get('profile'); @@ -149,6 +153,13 @@ export class CreateProcessPage implements OnInit { }; }) + const DocumentToSave = this.documents.map((e) => { + return { + ApplicationId: e.ApplicationType, + SourceId: e.Id + } + }); + if(this.taskParticipants.length > 0) { switch (this.taskType) { case '0': @@ -157,7 +168,7 @@ export class CreateProcessPage implements OnInit { CountryCode: 'AO', Priority: this.postData.Priority, UserEmail: this.user, - SubjectTypeId: this.postData.SubjectTypeId, + SubjectTypes: this.postData.SubjectTypes , UsersSelected: attendees, DispatchFolder: this.dispatchFolder, } @@ -170,7 +181,7 @@ export class CreateProcessPage implements OnInit { CountryCode: 'AO', Priority: this.postData.Priority, UserEmail: this.user, - SubjectTypeId: this.postData.SubjectTypeId, + SubjectTypes: this.postData.SubjectTypes , UsersSelected: attendees, DispatchFolder: this.dispatchFolder, } @@ -183,7 +194,7 @@ export class CreateProcessPage implements OnInit { CountryCode: 'AO', Priority: this.postData.Priority, UserEmail: this.user, - SubjectTypeId: this.postData.SubjectTypeId, + SubjectTypes: this.postData.SubjectTypes , UsersSelected: attendees, DispatchFolder: this.dispatchFolder, } @@ -373,6 +384,31 @@ export class CreateProcessPage implements OnInit { } + removeAttachment(index: number){ + + this.documents = this.documents.filter( (e, i) => index != i); + + } + + + async getDoc(){ + const modal = await this.modalController.create({ + component: SearchPage, + cssClass: 'modal-width-100-width-background modal', + componentProps: { + type: 'AccoesPresidenciais & ArquivoDespachoElect', + showSearchInput: true, + select: true + } + }); + await modal.present(); + modal.onDidDismiss().then((res)=>{ + if(res){ + const data = res.data; + this.documents.push(data.selected); + } + }); + } } \ No newline at end of file diff --git a/src/app/models/despacho.model.ts b/src/app/models/despacho.model.ts index 2318cb945..edb2f5c42 100644 --- a/src/app/models/despacho.model.ts +++ b/src/app/models/despacho.model.ts @@ -5,7 +5,7 @@ export class Despacho{ DistributionType: string; CountryCode: string; Priority: string; - SubjectTypeId:string; + SubjectTypes: any[]; UserEmail: string; UsersSelected: Participant[]; DispatchFolder: Folder; diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss index a1b20e389..1a9cb2e72 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss @@ -173,23 +173,21 @@ font-size: 13px; .close-button { -display: none; + display: none; } .list:hover { -.app-name { - display: none; + .app-name { + display: none; + } + + .close-button { + display: block !important; + } } - -.close-button { - display: block !important; -} -} - - - + .app-name{ background: #42b9f2; @@ -209,18 +207,3 @@ display: none; } -.close-button { -display: none; -} - - -.list:hover { - -.app-name { - display: none; -} - -.close-button { - display: block !important; -} -} \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 86e28603f..dc6327df2 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -94,8 +94,7 @@ export class ExpedientTaskModalPage implements OnInit { SourceSecFsId: this.task.workflowInstanceDataFields.FsId, //361 SouceType: 'DOC', //FOLDER SourceId: this.task.workflowInstanceDataFields.DocId, //FolderId - DeadlineType: '', - + DeadlineType: '' }; this.postData.DispatchFolder = this.dispatchFolder; @@ -103,7 +102,7 @@ export class ExpedientTaskModalPage implements OnInit { /* By Default TypeDeadline should be 'Normal' */ this.postData.Priority = '99999861'; /* By Default TypeDeadline should be 'Economia' */ - this.postData.SubjectTypeId = '99999844'; + this.postData.SubjectTypes = [99999844]; /* Initialize 'Subject' with the title of the expedient */ this.postData.DispatchFolder.Subject = this.task.workflowInstanceDataFields.Subject; this.profile = this.navParams.get('profile'); @@ -191,7 +190,7 @@ export class ExpedientTaskModalPage implements OnInit { CountryCode: 'AO', Priority: this.postData.Priority, UserEmail: this.user, - SubjectTypeId: this.postData.SubjectTypeId, + SubjectTypes: this.postData.SubjectTypes , UsersSelected: attendees, DispatchFolder: this.dispatchFolder, AttachmentList: docs @@ -206,7 +205,7 @@ export class ExpedientTaskModalPage implements OnInit { CountryCode: 'AO', Priority: this.postData.Priority, UserEmail: this.user, - SubjectTypeId: this.postData.SubjectTypeId, + SubjectTypes: this.postData.SubjectTypes , UsersSelected: attendees, DispatchFolder: this.dispatchFolder, AttachmentList: docs @@ -220,7 +219,7 @@ export class ExpedientTaskModalPage implements OnInit { CountryCode: 'AO', Priority: this.postData.Priority, UserEmail: this.user, - SubjectTypeId: this.postData.SubjectTypeId, //this.selectedTypes + SubjectTypes: this.postData.SubjectTypes , //this.selectedTypes UsersSelected: attendees, DispatchFolder: this.dispatchFolder, AttachmentList: docs