diff --git a/package-lock.json b/package-lock.json index 615794d6f..fd3d134d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53484,7 +53484,7 @@ }, "cordova-plugin-ffmpeg": { "version": "git+ssh://git@github.com/MaximBelov/cordova-plugin-ffmpeg.git#535a64e437f81b34bacf090da7fc97e6754189c7", - "from": "cordova-plugin-ffmpeg@https://github.com/MaximBelov/cordova-plugin-ffmpeg.git" + "from": "cordova-plugin-ffmpeg@github:MaximBelov/cordova-plugin-ffmpeg" }, "cordova-plugin-file": { "version": "6.0.2", diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts index 46d7857d3..a4e8feab5 100644 --- a/src/app/models/dailyworktask.model.ts +++ b/src/app/models/dailyworktask.model.ts @@ -68,6 +68,7 @@ export class fullTask { workflowInstanceFolio: string workflowInstanceID: number workflowName: string + isDelegated: boolean } export const activityInstanceNameArray = [ diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index ac19bc094..2873f7c2f 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -135,6 +135,15 @@ +
+
+ + Todo dia + + +
+
+
@@ -163,7 +172,8 @@
-
+ +
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index 206422aa2..04f8d0ddb 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -88,6 +88,7 @@ export class EditEventPage implements OnInit { sesseionStora = SessionStore environment = environment + allDayCheck: boolean = false; constructor( private modalController: ModalController, @@ -112,6 +113,7 @@ export class EditEventPage implements OnInit { this.caller = this.navParams.get('caller'); this.initCalendarName = this.postEvent.CalendarName; + this.allDayCheck = this.postEvent.IsAllDayEvent; @@ -652,4 +654,28 @@ export class EditEventPage implements OnInit { } return string; } + + onCheckboxChange(event: any) { + if (this.allDayCheck) { + this.postEvent.IsAllDayEvent = this.allDayCheck; + this.postEvent.StartDate = this.setAlldayTime(this.postEvent.StartDate) + + console.log('Recurso ativado!!'); + } else { + this.postEvent.IsAllDayEvent = this.allDayCheck; + console.log('Recurso desativado'); + + } + } + + setAlldayTime(timeToReturn) { + let date: any = new Date(timeToReturn) || new Date(); + let newdate = new Date(); + date.setHours(0) + date.setMinutes(0) + date.setSeconds(0); + + + return date + } } diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index de1a8a5c3..d64b939ce 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -116,7 +116,7 @@
Todo dia - +
@@ -131,7 +131,19 @@
- + + + + + diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index c1e182bda..4235073ba 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -881,15 +881,14 @@ export class NewEventPage implements OnInit { onCheckboxChange(event: any) { if (this.allDayCheck) { - this.allDayCheck = !this.allDayCheck this.postEvent.IsAllDayEvent = this.allDayCheck; + this.postEvent.StartDate = this.setAlldayTime(this.postEvent.StartDate) - console.log('Recurso desativado'); - } else { - this.allDayCheck = !this.allDayCheck - this.postEvent.IsAllDayEvent = this.allDayCheck; - this.postEvent.StartDate = this.setAlldayTime(this.CalendarDate) console.log('Recurso ativado!!'); + } else { + this.postEvent.IsAllDayEvent = this.allDayCheck; + console.log('Recurso desativado'); + } } diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html index f5afa6fde..64503a241 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html @@ -27,7 +27,7 @@
Outras opções
- + diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index 3769430e1..05bfe9d33 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -48,6 +48,7 @@ export class DespachoPrPage implements OnInit { dropButton = false selectedIndex = 0 + isDelegated:boolean = false; showOptions = false @@ -120,7 +121,8 @@ export class DespachoPrPage implements OnInit { async LoadTaskDetail(serial: string) { this.processes.GetTask(serial).subscribe((res: fullTask) => { this.TaskService.loadDiplomas(); - + console.log('is delegate despach pr',res.isDelegated) + this.isDelegated = res.isDelegated this.task = { "SerialNumber": res.serialNumber, "Folio": res.workflowInstanceDataFields.Subject, diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html index 57cb6c42a..afa88ce41 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html @@ -24,7 +24,7 @@
Reencaminhar para Área Jurídica
Outras opções
- +
@@ -34,7 +34,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 25247c366..0dd8836b2 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -59,6 +59,7 @@ export class DespachoPage implements OnInit { dropButton = true showOptions = false + isDelegated = false; constructor(private activateRoute: ActivatedRoute, @@ -136,7 +137,8 @@ export class DespachoPage implements OnInit { } catch (error) { console.log(error) } - + console.log('is Delegated',res.isDelegated) + this.isDelegated = res.isDelegated; this.task = { "SerialNumber": res.serialNumber, "Folio": res.workflowInstanceDataFields.Subject, diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html index 19e6b2287..37cefb059 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html @@ -25,7 +25,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts index 96ca7bc5d..442bf7231 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts @@ -36,6 +36,7 @@ export class DiplomasGerarPage implements OnInit { attachments:any; customDate: any; caller:string; + isDelegated: boolean; showOptions = false constructor( @@ -101,6 +102,8 @@ export class DiplomasGerarPage implements OnInit { this.processes.GetTask(serial).subscribe(res => { this.TaskService.loadDiplomas() + console.log('is delegated', res.isDelegated) + this.isDelegated = res.isDelegated; this.task = { "SerialNumber": res.serialNumber, "Folio": res.workflowInstanceDataFields.Subject, diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html index 237ba8829..628670d9e 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html @@ -23,7 +23,7 @@
- +
@@ -35,7 +35,7 @@ - +
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index 44eab1ef5..4318a2ec3 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts @@ -44,6 +44,7 @@ export class ExpedientePrPage implements OnInit { loggeduser: LoginUserRespose; documents: SearchList[] = []; attachments:any; + isDelegated: boolean; constructor( private processes: ProcessesService, @@ -115,7 +116,8 @@ export class ExpedientePrPage implements OnInit { let date = new Date(res.taskStartDate); date.setMonth(date.getMonth() + 1); let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); - + console.log('is delegated expeidente pr',res.isDelegated) + this.isDelegated = res.isDelegated this.TaskService.loadExpedientes(); this.task = { "SerialNumber": res.serialNumber, diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index 47a8f9e07..bcb2bd855 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -60,7 +60,7 @@
- +
@@ -69,7 +69,7 @@
- +
@@ -78,7 +78,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index fcca6fd9d..5b6e7f36c 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -51,6 +51,7 @@ export class PedidoPage implements OnInit { taskArrayActions = []; showOptions = false + isDelegated: boolean; constructor(private activatedRoute: ActivatedRoute, private processes: ProcessesService, private menu: MenuController, @@ -106,7 +107,8 @@ export class PedidoPage implements OnInit { this.fulltask = res this.TaskService.loadPedidos(); - + console.log('is delegated pedido', res.isDelegated) + this.isDelegated = res.isDelegated if (res.workflowDisplayName == 'Pedido de Parecer' || res.workflowDisplayName == 'Pedido de Parecer do Presidente') { let date = new Date(res.taskStartDate); diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.html b/src/app/shared/popover/despachos-options/despachos-options.page.html index 43eb6c605..dccbb8986 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.html +++ b/src/app/shared/popover/despachos-options/despachos-options.page.html @@ -20,7 +20,7 @@
- +
@@ -36,7 +36,7 @@
- +
@@ -47,7 +47,7 @@
- +
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts index 952d7f07d..0c39a738a 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.ts +++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts @@ -26,6 +26,7 @@ export class DespachosOptionsPage implements OnInit { fulltask: fullTask; serialNumber: string; environment = environment + isDelegated: boolean constructor( private processes: ProcessesService, @@ -41,6 +42,8 @@ export class DespachosOptionsPage implements OnInit { ) { this.task = this.navParams.get('task') this.fulltask = this.navParams.get('fulltask') + console.log('is delegated ',this.fulltask.isDelegated ) + this.isDelegated = this.fulltask.isDelegated; this.serialNumber = this.task.SerialNumber diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html index 56bd1cd09..0fed74a4a 100644 --- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html +++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html @@ -19,7 +19,7 @@
- +
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts index 369fb5fc3..db80a4bc6 100644 --- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts +++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts @@ -29,6 +29,7 @@ export class DespachosPrOptionsPage implements OnInit { serialNumber: string; profile: string environment = environment + isDelegated: boolean; constructor(private activateRoute: ActivatedRoute, private processes: ProcessesService, @@ -45,6 +46,8 @@ export class DespachosPrOptionsPage implements OnInit { ) { } ngOnInit() { + console.log('is delegated', this.fulltask.isDelegated) + this.isDelegated = this.fulltask.isDelegated; this.profile = "mdgpr"; diff --git a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.html b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.html index 5f0257527..02fd8c9e7 100644 --- a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.html +++ b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.html @@ -2,7 +2,7 @@
- +
diff --git a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts index d1b4d03fe..cac436e82 100644 --- a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts +++ b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts @@ -22,6 +22,7 @@ export class DiplomasGerarOptionsPage implements OnInit { task: customTask fulltask: fullTask; serialNumber: string; + isDelegated: boolean constructor( private processes: ProcessesService, @@ -40,6 +41,7 @@ export class DiplomasGerarOptionsPage implements OnInit { this.task = this.navParams.get('task') this.fulltask = this.navParams.get('fulltask') this.serialNumber = this.navParams.get('serialNumber') + this.isDelegated = this.fulltask.isDelegated; } diff --git a/src/app/shared/popover/request-options/request-options.page.html b/src/app/shared/popover/request-options/request-options.page.html index 593e95eae..638d98ebb 100644 --- a/src/app/shared/popover/request-options/request-options.page.html +++ b/src/app/shared/popover/request-options/request-options.page.html @@ -2,7 +2,7 @@
- +
@@ -12,7 +12,7 @@
- +
@@ -22,7 +22,7 @@
- +
diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts index f319a5658..9a50c246a 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -28,6 +28,7 @@ export class RequestOptionsPage implements OnInit { serialNumber : string; showEnviarPendentes = false; taskActions = []; + isDelegated: boolean; constructor( private popoverController: PopoverController, @@ -44,6 +45,7 @@ export class RequestOptionsPage implements OnInit { this.fulltask = this.navParams.get('fulltask'); this.serialNumber = this.navParams.get('serialNumber'); this.taskActions = this.navParams.get('actions'); + this.isDelegated = this.fulltask.isDelegated; this.activatedRoute.queryParams.subscribe(params => { if(params["serialNumber"]) {