diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 73dc21b82..c0f9e9d66 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,141 +1,142 @@
-import { NgModule } from '@angular/core';
-import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
-import { ChatPage } from './pages/chat/chat.page';
-import { MessagesPage } from './pages/chat/messages/messages.page';
-
-const routes: Routes = [
- {
- path: '',
- loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule)
- },
- {
- path: '',
- loadChildren: () => import('./home/home.module').then( m => m.HomePageModule)
- },
- {
- path: 'empty-chat',
- loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule)
- },
- {
- path: 'empty-container',
- loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule)
- },
- {
- path: 'events-to-approve',
- loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule)
- },
- {
- path: 'expedients',
- loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule)
- },
- {
- path: 'document-detail',
- loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule)
- },
- {
- path: 'edit-group',
- loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule)
- },
- {
- path: 'pedidos',
- loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule)
- },
- {
- path: 'event-list',
- loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule)
- },
- {
- path: 'despachos',
- loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule)
- },
- {
- path: 'create-process',
- loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule)
- },
- {
- path: 'pendentes',
- loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule)
- },
- {
- path: 'delegar',
- loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule)
- },
- {
- path: 'add-note',
- loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule)
- },
- {
- path: 'dar-parecer',
- loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule)
- },
- {
- path: 'opts-expediente',
- loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule)
- },
- {
- path: 'despachos-pr',
- loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule)
- },
- {
- path: 'diplomas',
- loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule)
- },
- {
- path: 'expedientes-pr',
- loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule)
- },
- {
- path: 'diplomas-assinar',
- loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule)
- },
- {
- path: 'opts-expediente-pr',
- loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule)
- },
- {
- path: 'despachos-options',
- loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule)
- },
- {
- path: 'despachos-pr-options',
- loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule)
- },
- {
- path: 'deploma-options',
- loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule)
- },
- {
- path: 'pin',
- loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule)
- },
- {
- path: 'fingerprint',
- loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule)
- },
- {
- path: 'new-event',
- loadChildren: () => import('./shared/agenda/new-event/new-event.module').then( m => m.NewEventPageModule)
- },
- {
- path: 'event-list',
- loadChildren: () => import('./shared/agenda/event-list/event-list.module').then( m => m.EventListPageModule)
- },
- {
- path: 'approve-event',
- loadChildren: () => import('./shared/agenda/approve-event/approve-event.module').then( m => m.ApproveEventPageModule)
- },
- {
- path: 'bad-request',
- loadChildren: () => import('./shared/popover/bad-request/bad-request.module').then( m => m.BadRequestPageModule)
- },
- {
- path: 'success-message',
- loadChildren: () => import('./shared/popover/success-message/success-message.module').then( m => m.SuccessMessagePageModule)
- },
- {
- path: 'forward',
- loadChildren: () => import('./modals/forward/forward.module').then( m => m.ForwardPageModule)
- },
{
+import { NgModule } from '@angular/core';
+import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
+import { ChatPage } from './pages/chat/chat.page';
+import { MessagesPage } from './pages/chat/messages/messages.page';
+
+const routes: Routes = [
+ {
+ path: '',
+ loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule)
+ },
+ {
+ path: '',
+ loadChildren: () => import('./home/home.module').then( m => m.HomePageModule)
+ },
+ {
+ path: 'empty-chat',
+ loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule)
+ },
+ {
+ path: 'empty-container',
+ loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule)
+ },
+ {
+ path: 'events-to-approve',
+ loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule)
+ },
+ {
+ path: 'expedients',
+ loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule)
+ },
+ {
+ path: 'document-detail',
+ loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule)
+ },
+ {
+ path: 'edit-group',
+ loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule)
+ },
+ {
+ path: 'pedidos',
+ loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule)
+ },
+ {
+ path: 'event-list',
+ loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule)
+ },
+ {
+ path: 'despachos',
+ loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule)
+ },
+ {
+ path: 'create-process',
+ loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule)
+ },
+ {
+ path: 'pendentes',
+ loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule)
+ },
+ {
+ path: 'delegar',
+ loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule)
+ },
+ {
+ path: 'add-note',
+ loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule)
+ },
+ {
+ path: 'dar-parecer',
+ loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule)
+ },
+ {
+ path: 'opts-expediente',
+ loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule)
+ },
+ {
+ path: 'despachos-pr',
+ loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule)
+ },
+ {
+ path: 'diplomas',
+ loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule)
+ },
+ {
+ path: 'expedientes-pr',
+ loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule)
+ },
+ {
+ path: 'diplomas-assinar',
+ loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule)
+ },
+ {
+ path: 'opts-expediente-pr',
+ loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule)
+ },
+ {
+ path: 'despachos-options',
+ loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule)
+ },
+ {
+ path: 'despachos-pr-options',
+ loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule)
+ },
+ {
+ path: 'deploma-options',
+ loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule)
+ },
+ {
+ path: 'pin',
+ loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule)
+ },
+ {
+ path: 'fingerprint',
+ loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule)
+ },
+ {
+ path: 'new-event',
+ loadChildren: () => import('./shared/agenda/new-event/new-event.module').then( m => m.NewEventPageModule)
+ },
+ {
+ path: 'event-list',
+ loadChildren: () => import('./shared/agenda/event-list/event-list.module').then( m => m.EventListPageModule)
+ },
+ {
+ path: 'approve-event',
+ loadChildren: () => import('./shared/agenda/approve-event/approve-event.module').then( m => m.ApproveEventPageModule)
+ },
+ {
+ path: 'bad-request',
+ loadChildren: () => import('./shared/popover/bad-request/bad-request.module').then( m => m.BadRequestPageModule)
+ },
+ {
+ path: 'success-message',
+ loadChildren: () => import('./shared/popover/success-message/success-message.module').then( m => m.SuccessMessagePageModule)
+ },
+ {
+ path: 'forward',
+ loadChildren: () => import('./modals/forward/forward.module').then( m => m.ForwardPageModule)
+ },
+ {
path: 'edit-event-to-approve',
loadChildren: () => import('./shared/agenda/edit-event-to-approve/edit-event-to-approve.module').then( m => m.EditEventToApprovePageModule)
},
@@ -148,18 +149,18 @@ const routes: Routes = [
loadChildren: () => import('./shared/publication/edit-action/edit-action.module').then( m => m.EditActionPageModule)
},
-
-
- /* {
- path: 'chat',
- component: ChatPage
- } */
-
-];
-@NgModule({
- imports: [
- RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
- ],
- exports: [RouterModule]
-})
-export class AppRoutingModule {}
+
+
+ /* {
+ path: 'chat',
+ component: ChatPage
+ } */
+
+];
+@NgModule({
+ imports: [
+ RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
+ ],
+ exports: [RouterModule]
+})
+export class AppRoutingModule {}
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 6478859fc..d1f38ce15 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -45,6 +45,7 @@ import { MatDialogModule } from '@angular/material/dialog';
import { MatSelectModule } from '@angular/material/select';
import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
import { MatButtonModule } from '@angular/material/button';
+import { ProcessesResolverService } from './resolvers/processes-resolver.service';
@NgModule({
@@ -57,7 +58,7 @@ import { MatButtonModule } from '@angular/material/button';
provide: DateAdapter,
useFactory: adapterFactory
}),
- IonicModule.forRoot(),
+ IonicModule.forRoot({animated: false}),
IonicStorageModule.forRoot(),
AppRoutingModule,
HttpClientModule,
diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts
index 13f9bc094..f07e7867c 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/home/home-routing.module.ts
@@ -7,6 +7,7 @@ import { GroupMessagesPage } from '../pages/chat/group-messages/group-messages.p
import { MessagesPage } from '../pages/chat/messages/messages.page';
import { ProcessesResolverService } from '../resolvers/processes-resolver.service';
import { UserDataResolver } from '../resolvers/userData.resolver';
+import { DiplomasPage } from '../shared/gabinete-digital/diplomas/diplomas.page';
import { HomePage } from './home.page';
@@ -15,7 +16,7 @@ const routes: Routes = [
path: 'home',
component: HomePage,
resolve: {
- userData: UserDataResolver
+ userData: UserDataResolver,
},
children: [
{
@@ -141,6 +142,9 @@ const routes: Routes = [
},
{
path: 'gabinete-digital',
+ resolve: {
+ diplomas: ProcessesResolverService
+ },
children: [
{
path:'',
@@ -216,7 +220,6 @@ const routes: Routes = [
{
path: '',
loadChildren: ()=> import('../pages/gabinete-digital/diplomas/diplomas.module').then(m => m.DiplomasPageModule),
- /* resolve { diplomas: ProcessesResolverService}, */
},
{
path:':SerialNumber/:caller',
diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts
index 7a1a71376..5cdd67938 100644
--- a/src/app/home/home.module.ts
+++ b/src/app/home/home.module.ts
@@ -8,7 +8,6 @@ import { HomePageRoutingModule } from './home-routing.module';
import { HomePage } from './home.page';
/* import { IonicSelectableModule } from 'ionic-selectable'; */
-import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from '../components/components.module';
@NgModule({
@@ -19,6 +18,6 @@ import { ComponentsModule } from '../components/components.module';
HomePageRoutingModule,
ComponentsModule
],
- declarations: [HomePage]
+ declarations: [HomePage],
})
export class HomePageModule {}
diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html
index 8e85112c0..ca6e19283 100644
--- a/src/app/modals/create-process/create-process.page.html
+++ b/src/app/modals/create-process/create-process.page.html
@@ -27,27 +27,65 @@
-
+
+
+
+
+
+
+
+
+
+
+
+ {{type.Description}}
+
+
+
+
+
+
+
diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts
index 7bb21986e..bc178d265 100644
--- a/src/app/modals/create-process/create-process.page.ts
+++ b/src/app/modals/create-process/create-process.page.ts
@@ -187,6 +187,9 @@ export class CreateProcessPage implements OnInit {
participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [
// Validators.required
]),
+ selectedTypes: new FormControl(this.selectedTypes, [
+ Validators.required,
+ ]),
})
}
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 7f978618c..a6cee6e16 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -237,19 +237,21 @@
-
+
-
+
{{document.SourceName}}
- Correspondencia
- AccoesPresidenciais
- ArquivoDespachoElect
-
-
- {{document.Stakeholders}} {{document.CreateDate | date: 'dd-MM-yy'}}
+
+ {{document.Stakeholders}}
+
+ Correspondência
+ Acções Presidenciais
+ Arquivo Despacho Electrónico
+
+ {{document.CreateDate | date: 'dd-MM-yy'}}
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 e02c6e206..81d99c9e5 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -136,6 +136,7 @@ export class NewEventPage implements OnInit {
};
}
+
close(){
this.modalController.dismiss();
}
@@ -188,8 +189,6 @@ export class NewEventPage implements OnInit {
this.runValidation()
if(this.Form.invalid) return false
-
- console.log('passed')
if(this.documents.length >= 0) {
this.postEvent.HasAttachments = true;
diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index fbff5023d..10cd89e2d 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -64,7 +64,7 @@
Documentos Anexados
-
+
{{attach.SourceName}}
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 39e6ba261..2f9eca264 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -88,6 +88,7 @@ export class EventsPage implements OnInit {
}
ngOnInit() {
+ this.activatedRoute.data.subscribe(data => console.log(data));
//Inicializar segment
this.segment = "Combinada";
//Initialize profile as mdgpr
@@ -285,13 +286,11 @@ export class EventsPage implements OnInit {
case 'MDGPR':
this.processes.GetTasksList("Expediente", false).subscribe(result => {
this.expedientList = result.reverse();
- console.log(this.expedientList);
});
break;
case 'PR':
this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
this.expedientList = result.reverse();
- console.log(this.expedientList);
});
break;
default:
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
index 12747404a..a672b6f0a 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
@@ -95,6 +95,7 @@ export class DiplomaPage implements OnInit {
component: DeplomaOptionsPage,
cssClass: 'exp-options',
componentProps: {
+ serialNumber: this.serialNumber,
task: this.task,
fulltask: this.fulltask,
taskAction:taskAction,
@@ -292,6 +293,4 @@ export class DiplomaPage implements OnInit {
}
-
-
}
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
index 272918cfc..2b2d25d5d 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
@@ -16,10 +16,10 @@
- Diplomas por validar
+ Por validar
- Diplomas assinados PR
+ Assinados PR
@@ -28,12 +28,7 @@
-
-
+
@@ -57,7 +52,7 @@
-
+ {{task.DocumentsQty}}
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
index 1a70997f6..9d3208a45 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
@@ -1,34 +1,31 @@
-import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
-import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { ActivatedRoute, NavigationEnd, NavigationError, NavigationExtras, NavigationStart, Router } from '@angular/router';
+import { DailyWorkTask } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
-import { formatDate } from '@angular/common';
-import { ModalController, NavParams } from '@ionic/angular';
-import { AlertService } from 'src/app/services/alert.service';
-import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/diploma.page';
+import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
@Component({
selector: 'app-diplomas',
templateUrl: './diplomas.page.html',
styleUrls: ['./diplomas.page.scss'],
})
-export class DiplomasPage implements OnInit {
-diplomasList:DailyWorkTask[] = [];
+export class DiplomasPage implements OnInit, OnDestroy {
+ list:DailyWorkTask[] = [];
+ diplomasList:DailyWorkTask[] = [];
diplomasAssinadoList:DailyWorkTask[] = [];
showLoader: boolean;
totalDocs:any;
serialNumber:string;
-@Input() profile:string;
-@Input() segment:string;
+segment:string;
constructor(
private processes:ProcessesService,
- private modalController: ModalController,
- private alertService: AlertService,
private router: Router,
private activatedRoute: ActivatedRoute,
) {
+ this.diplomasList = [];
+ this.segment = 'validar';
this.activatedRoute.queryParams.subscribe(params => {
console.log('Cria');
@@ -37,34 +34,103 @@ constructor(
} else if (params['segment'] == 'assinados') {
this.segment = 'assinados';
}
-
- this.LoadList();
});
+
}
ngOnInit() {
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
- console.log('Atualiza');
-
- this.LoadList();
+ this.refreshing();
}
});
- console.log('Init');
- this.LoadList();
+ }
+
+ /* async loadDiplomas(){
+ console.log('Load');
+
+ this.activatedRoute.data.subscribe(data => {
+ console.log(data['diplomas']);
+
+ switch (this.segment) {
+ case 'validar':
+
+ let diplomasValidar = data['diplomas'].filter(data => data.activityInstanceName == "Revisar Diploma");
+ diplomasValidar.forEach(async element => {
+ let DocId = element.workflowInstanceDataFields.FolderID;
+ let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
+
+ let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
+
+ let date = new Date(element.taskStartDate);
+ date.setMonth(date.getMonth() + 1);
+ let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+
+ let task = {
+ "SerialNumber": element.serialNumber,
+ "Folio": element.workflowInstanceDataFields.Subject,
+ "Senders": element.workflowInstanceDataFields.Sender,
+ "CreateDate": taskDate,
+ "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+ "Remetente": element.workflowInstanceDataFields.Remetente,
+ "DocumentsQty": res.DocumentsTotal,
+ "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
+ }
+ this.diplomasList.push(task);
+ this.diplomasList = removeDuplicate( this.diplomasList)
+
+ });
+ this.showLoader = false;
+ break;
+
+ case 'assinados':
+ //this.diplomasList = new Array();
+ let diplomasAssinados = data.diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
+ diplomasAssinados.forEach(async element => {
+ let DocId = element.workflowInstanceDataFields.FolderID;
+ let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
+
+ let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
+
+ let date = new Date(element.taskStartDate);
+ date.setMonth(date.getMonth() + 1);
+ let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+
+ let task = {
+ "SerialNumber": element.serialNumber,
+ "Folio": element.workflowInstanceDataFields.Subject,
+ "Senders": element.workflowInstanceDataFields.Sender,
+ "CreateDate": taskDate,
+ "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+ "Remetente": element.workflowInstanceDataFields.Remetente,
+ "DocumentsQty": this.totalDocs,
+ "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
+ }
+ this.diplomasList.push(task);
+ this.diplomasList = removeDuplicate( this.diplomasList)
+
+ });
+ this.showLoader = false;
+ break;
+ }
+ });
+ } */
+
+ async getTotalDocs(DocId:any){
+ let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
+ console.log(res.DocumentsTotal);
+ return res.DocumentsTotal;
+ }
+
+ ngOnDestroy(): void {
+ console.log('8. on destroy called');
}
segmentChanged(ev: any) {
-
- let navigationExtras: NavigationExtras;
-
- if (this.segment == 'assinados') {
- navigationExtras= { queryParams: {"assinados": true,}};
- } else if (this.segment == 'validar') {
- navigationExtras = { queryParams: {"validar": true,}};
- }
-
- this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras);
this.LoadList();
}
@@ -73,115 +139,95 @@ constructor(
}
async LoadList(){
+ this.diplomasList = [];
+ console.log(this.diplomasList);
+
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
-
+
switch (this.segment) {
case 'validar':
- this.diplomasList = new Array();
- let diplomasValidar = diplomas.reverse().filter(data => data.activityInstanceName == "Revisar Diploma");
- diplomasValidar.forEach(element => {
- let DocId = element.workflowInstanceDataFields.FolderID;
- let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
- this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
- this.totalDocs = res.DocumentsTotal;
- console.log(res.DocumentsTotal);
+ let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma");
+ console.log(diplomasValidar);
+
+ diplomasValidar.forEach(async element => {
+ let DocId = element.workflowInstanceDataFields.FolderID;
+ let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
+ this.totalDocs = await this.getTotalDocs(DocId);
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-
+
let task = {
- "SerialNumber": element.serialNumber,
- "Folio": element.workflowInstanceDataFields.Subject,
- "Senders": element.workflowInstanceDataFields.Sender,
- "CreateDate": taskDate,
- "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
- "Remetente": element.workflowInstanceDataFields.Remetente,
- "DocumentsQty": 0,
- "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
+ "SerialNumber": element.serialNumber,
+ "Folio": element.workflowInstanceDataFields.Subject,
+ "Senders": element.workflowInstanceDataFields.Sender,
+ "CreateDate": taskDate,
+ "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+ "Remetente": element.workflowInstanceDataFields.Remetente,
+ "DocumentsQty": this.totalDocs,
+ "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
}
this.diplomasList.push(task);
- },
- (error)=> {
+ this.diplomasList = removeDuplicate(this.diplomasList);
+ this.diplomasList = this.sortArrayISODate(this.diplomasList).reverse();
- let date = new Date(element.taskStartDate);
- date.setMonth(date.getMonth() + 1);
- let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-
- let task = {
- "SerialNumber": element.serialNumber,
- "Folio": element.workflowInstanceDataFields.Subject,
- "Senders": element.workflowInstanceDataFields.Sender,
- "CreateDate": taskDate,
- "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
- "Remetente": element.workflowInstanceDataFields.Remetente,
- "DocumentsQty": 0,
- "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- }
- this.diplomasList.push(task);
});
- });
- this.showLoader = false;
+ this.showLoader = false;
break;
case 'assinados':
this.diplomasList = new Array();
let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
- diplomasAssinados.forEach(element => {
+ diplomasAssinados.forEach(async element => {
let DocId = element.workflowInstanceDataFields.FolderID;
let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
- this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
- this.totalDocs = res.DocumentsTotal;
- console.log(res.DocumentsTotal);
+ this.totalDocs = await this.getTotalDocs(DocId);
- let date = new Date(element.taskStartDate);
- date.setMonth(date.getMonth() + 1);
- let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+ let date = new Date(element.taskStartDate);
+ date.setMonth(date.getMonth() + 1);
+ let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
- let task = {
+ let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
- "DocumentsQty": 0,
+ "DocumentsQty": this.totalDocs,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
- }
- this.diplomasList.push(task);
- },
- (error)=> {
-
- let date = new Date(element.taskStartDate);
- date.setMonth(date.getMonth() + 1);
- let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-
- let task = {
- "SerialNumber": element.serialNumber,
- "Folio": element.workflowInstanceDataFields.Subject,
- "Senders": element.workflowInstanceDataFields.Sender,
- "CreateDate": taskDate,
- "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
- "Remetente": element.workflowInstanceDataFields.Remetente,
- "DocumentsQty": 0,
- "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- }
- this.diplomasList.push(task);
- });
+ }
+ this.diplomasList.push(task);
+ this.diplomasList = removeDuplicate(this.diplomasList);
+ this.diplomasList = this.sortArrayISODate(this.diplomasList).reverse();
+
});
this.showLoader = false;
break;
}
}
- doRefresh(event) {
+ sortArrayISODate(myArray: any) {
+ return myArray.sort(function(a, b) {
+ return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
+ });
+ }
+
+ async refreshing() {
+ setTimeout(() => {
+ this.LoadList();
+ }, 1500);
+ }
+
+
+ async doRefresh(event) {
+ console.log('refresh');
+
+ //this.loadDiplomas();
this.LoadList();
setTimeout(() => {
event.target.complete();
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
index 5660f3d45..2c071472b 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
@@ -44,7 +44,7 @@
-
+
@@ -65,12 +65,12 @@
Urgentíssimo (8 horas para a execução da tarefa)
-
+
- 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)
+ 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)
@@ -95,7 +95,7 @@
-
{{type.Description}}
-
-
+ -->
-
- {{type.Description}}
+
+ {{type.Description}}
@@ -129,7 +128,6 @@
-
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 d50381dbd..d2fb6c86f 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
@@ -191,7 +191,7 @@ export class ExpedientTaskModalPage implements OnInit {
Location: new FormControl(this.postData.DispatchFolder.Message, [
Validators.required,
]),
- selectedTypes: new FormControl(this.toppingsValues, [
+ selectedTypes: new FormControl(this.selectedTypes, [
Validators.required,
]),
Priority: new FormControl(this.postData.Priority, [
@@ -218,20 +218,22 @@ export class ExpedientTaskModalPage implements OnInit {
if(this.loggeduser.Profile == 'MDGPR') {
this.injectValidation()
this.runValidation()
+
+ if(this.Form.invalid) return false
}
- if(this.Form.invalid) return false
- if(this.postData.Priority=='99999861'){
+
+ if(this.postData.Priority=='99999861') {
this.dispatchFolder.DeadlineType = 'Normal';
}
- else if(this.postData.Priority=='99999862'){
+ else if(this.postData.Priority=='99999862') {
this.dispatchFolder.DeadlineType = 'Urgente';
}
- else if(this.postData.Priority=='99999863'){
+ else if(this.postData.Priority=='99999863') {
this.dispatchFolder.DeadlineType = 'Muito Urgente';
}
- else if(this.postData.Priority=='99999864'){
+ else if(this.postData.Priority=='99999864') {
this.dispatchFolder.DeadlineType = 'Urgentíssimo';
}
let attendees = this.taskParticipants.concat(this.taskParticipantsCc);
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index 2c3a5143f..07975558d 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -42,8 +42,7 @@ export class ExpedientesPrPage implements OnInit {
ngOnInit() {
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
- this.LoadList();
- console.log('not run');
+ this.refreshing();
}
});
}
@@ -107,6 +106,12 @@ export class ExpedientesPrPage implements OnInit {
}
}
+ refreshing() {
+ setTimeout(() => {
+ this.LoadList();
+ }, 1500);
+ }
+
doRefresh(event) {
this.LoadList();
setTimeout(() => {
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 9d96928d5..3e3e06a8c 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -431,8 +431,7 @@ export class GabineteDigitalPage implements OnInit {
openDiplomasPage(segment:string) {
if( window.innerWidth <= 801){
- let navigationExtras: NavigationExtras = { queryParams: {"segment": segment}};
- this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras);
+ this.router.navigate(['/home/gabinete-digital/diplomas']);
}
else{
this.closeAllDesktopComponents();
diff --git a/src/app/pages/publications/new-action/new-action.module.ts b/src/app/pages/publications/new-action/new-action.module.ts
index d5d868f49..3924eab40 100644
--- a/src/app/pages/publications/new-action/new-action.module.ts
+++ b/src/app/pages/publications/new-action/new-action.module.ts
@@ -8,12 +8,40 @@ import { NewActionPageRoutingModule } from './new-action-routing.module';
import { NewActionPage } from './new-action.page';
+import { MatNativeDateModule } from '@angular/material/core';
+import {
+ NgxMatDatetimePickerModule,
+ NgxMatNativeDateModule,
+ NgxMatTimepickerModule
+} from '@angular-material-components/datetime-picker';
+import { ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatSelectModule } from '@angular/material/select';
+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
+import { MAT_DATE_LOCALE } from '@angular/material/core';
+import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatInputModule } from '@angular/material/input';
+import { MatDialogModule } from '@angular/material/dialog';
+
+
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
- NewActionPageRoutingModule
+ NewActionPageRoutingModule,
+ // Angular material
+ MatDatepickerModule,
+ MatInputModule,
+ MatNativeDateModule,
+ NgxMatDatetimePickerModule,
+ NgxMatTimepickerModule,
+ NgxMatNativeDateModule,
+ NgxMatMomentModule,
+ MatSelectModule,
+ MatButtonModule,
+ ReactiveFormsModule,
+ MatDialogModule,
],
exports: [NewActionPage],
declarations: [NewActionPage]
diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html
index c0c33141f..135958933 100644
--- a/src/app/pages/publications/new-action/new-action.page.html
+++ b/src/app/pages/publications/new-action/new-action.page.html
@@ -18,7 +18,7 @@
-
+
@@ -30,6 +30,7 @@
+
+
+
+
+
+
+
+
@@ -47,7 +67,8 @@
-
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/publications/new-action/new-action.page.ts b/src/app/pages/publications/new-action/new-action.page.ts
index eeae004ad..3758b8ada 100644
--- a/src/app/pages/publications/new-action/new-action.page.ts
+++ b/src/app/pages/publications/new-action/new-action.page.ts
@@ -1,29 +1,76 @@
import { Component, OnInit } from '@angular/core';
-import { AnimationController, ModalController } from '@ionic/angular';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { ModalController } from '@ionic/angular';
+import * as moment from 'moment';
import { PublicationFolder } from 'src/app/models/publicationfolder';
import { PublicationsService } from 'src/app/services/publications.service';
import { ToastService } from 'src/app/services/toast.service';
-import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
-import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
+import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
+import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
+
+
+const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
+ parse: {
+ dateInput: "YYYY-MMMM-DD HH:mm"
+ },
+ display: {
+ dateInput: "DD MMM YYYY H:mm",
+ monthYearLabel: "MMM YYYY",
+ dateA11yLabel: "LL",
+ monthYearA11yLabel: "MMMM YYYY"
+ }
+}
@Component({
selector: 'app-new-action',
templateUrl: './new-action.page.html',
styleUrls: ['./new-action.page.scss'],
+ providers: [
+ { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS },
+ ]
})
export class NewActionPage implements OnInit {
folder: PublicationFolder;
segment:string;
+ Form: FormGroup;
+ validateFrom = false
+
+ public date: any;
+ public disabled = false;
+ public showSpinners = true;
+ public showSeconds = false;
+ public touchUi = false;
+ public enableMeridian = false;
+ public minDate = new Date().toISOString().slice(0,10)
+ public endMinDate = new Date(new Date().getTime() + 15 * 60000);
+ public stepHour = 1;
+ public stepMinute = 5;
+ public stepSecond = 5;
+ public dateControlStart = new FormControl(moment("DD MM YYYY hh"));
+ public dateControlEnd = new FormControl(moment("DD MM YYYY hh"));
+
+ showLoader = false
+
+ get dateStart () {
+ return this.dateControlStart.value
+ }
+
+ get dateEnd () {
+ return this.dateControlEnd.value
+ }
+
constructor(
private modalController: ModalController,
private publication: PublicationsService,
- private animationController: AnimationController,
private toastService: ToastService
) {
this.folder = new PublicationFolder();
+
+ this.dateControlStart = new FormControl(moment(new Date()));
+ this.dateControlEnd = new FormControl(moment(new Date(new Date().getTime() + 15 * 60000)));
}
ngOnInit() {
@@ -34,7 +81,39 @@ export class NewActionPage implements OnInit {
console.log(ev.detail.value);
}
- async save(){
+ get dateValid() {
+ if (window.innerWidth <= 800) {
+ return this.folder.DateBegin < this.folder.DateEnd? ['ok']: []
+ } else {
+ return ['ok']
+ }
+ }
+
+ runValidation() {
+ this.validateFrom = true
+ }
+
+ injectValidation() {
+
+ this.Form = new FormGroup({
+ Subject: new FormControl(this.folder.Description, [
+ Validators.required,
+ // Validators.minLength(4)
+ ]),
+ Date: new FormControl(this.dateValid, [
+ Validators.required
+ ]),
+ })
+ }
+
+
+ async save() {
+
+ this.injectValidation()
+ this.runValidation()
+
+ if(this.Form.invalid) return false
+
this.folder = {
ProcessId: null,
Description: this.folder.Description,
@@ -43,7 +122,6 @@ export class NewActionPage implements OnInit {
DateEnd: this.folder.DateEnd,
ActionType: this.segment,
}
- console.log(this.folder);
try {
await this.publication.CreatePublicationFolder(this.folder).toPromise();
@@ -54,12 +132,9 @@ export class NewActionPage implements OnInit {
}
}
+
close(){
this.modalController.dismiss();
}
-
-
-
-
}
diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts
index 43c264baf..a2a16eff8 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.ts
+++ b/src/app/pages/publications/new-publication/new-publication.page.ts
@@ -1,24 +1,19 @@
import { Component, OnInit } from '@angular/core';
-import { AlertController, ModalController, NavParams } from '@ionic/angular';
-import { GalleryPage } from '../gallery/gallery.page';
+import { ModalController, NavParams } from '@ionic/angular';
/* import {Plugins, CameraResultType, CameraSource} from '@capacitor/core'; */
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
import { PublicationsService } from 'src/app/services/publications.service';
import { Publication } from 'src/app/models/publication';
import { Image } from 'src/app/models/image';
-import { ThrowStmt } from '@angular/compiler';
import { PhotoService } from 'src/app/services/photo.service';
-import { AlertService } from 'src/app/services/alert.service';
//Capacitor
-/* const { Camera } = Plugins; */
//Cordova
import { Camera, CameraOptions } from '@ionic-native/camera/ngx';
-import { PublicationFolder } from 'src/app/models/publicationfolder';
-import { ViewPublicationsPage } from '../view-publications/view-publications.page';
-import { LoadingService } from 'src/app/services/loading.service';
import { ToastService } from 'src/app/services/toast.service';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { ThemePalette } from '@angular/material/core';
@Component({
selector: 'app-new-publication',
@@ -26,6 +21,24 @@ import { ToastService } from 'src/app/services/toast.service';
styleUrls: ['./new-publication.page.scss'],
})
export class NewPublicationPage implements OnInit {
+
+ // date picker
+ public date: any;
+ public disabled = false;
+ public showSpinners = true;
+ public showSeconds = false;
+ public touchUi = false;
+ public enableMeridian = false;
+ public minDate = new Date().toISOString().slice(0,10)
+ public endMinDate = new Date(new Date().getTime() + 15 * 60000);
+ public stepHour = 1;
+ public stepMinute = 5;
+ public stepSecond = 5;
+ public color: ThemePalette = 'primary';
+
+ Form: FormGroup;
+ validateFrom = false
+
showLoader: boolean;
publication: Publication;
pub: Publication = new Publication();
@@ -38,7 +51,6 @@ export class NewPublicationPage implements OnInit {
Defaultimage:any = '';
-
photo: SafeResourceUrl;
guestPicture:any;
@@ -46,7 +58,6 @@ export class NewPublicationPage implements OnInit {
capturedImage:any;
capturedImageTitle:any;
-
constructor(
private modalController: ModalController,
public photoService: PhotoService,
@@ -59,13 +70,14 @@ export class NewPublicationPage implements OnInit {
this.publicationType = this.navParams.get('publicationType');
this.folderId = this.navParams.get('folderId');
this.publicationTitle = 'Nova Publicação';
- }
+ }
ngOnInit() {
this.setTitle();
this.clear();
// this.takePicture();
}
+
takePicture() {
const options: CameraOptions = {
quality: 90,
@@ -77,17 +89,17 @@ export class NewPublicationPage implements OnInit {
}
this.camera.getPicture(options).then((imageData) => {
- // imageData is either a base64 encoded string or a file URI
- // If it's base64 (DATA_URL):
- let base64Image = 'data:image/jpeg;base64,' + imageData;
- this.capturedImage = imageData;
- this.capturedImageTitle = new Date().getTime() + '.jpeg';
+ // imageData is either a base64 encoded string or a file URI
+ // If it's base64 (DATA_URL):
+ let base64Image = 'data:image/jpeg;base64,' + imageData;
+ this.capturedImage = imageData;
+ this.capturedImageTitle = new Date().getTime() + '.jpeg';
}, (err) => {
- /* console.log(err); */
+ /* console.log(err); */
});
}
- getPicture(){
+ getPicture() {
const options: CameraOptions = {
quality: 90,
sourceType: this.camera.PictureSourceType.PHOTOLIBRARY,
@@ -97,21 +109,46 @@ export class NewPublicationPage implements OnInit {
targetWidth: 720,
targetHeight: 720,
}
+
this.camera.getPicture(options).then((imageData) => {
// imageData is either a base64 encoded string or a file URI
// If it's base64 (DATA_URL):
let base64Image = 'data:image/jpeg;base64,' + imageData;
this.capturedImage = imageData;
this.capturedImageTitle = new Date().getTime() + '.jpeg';
- }, (err) => {
+ }, (err) => {
/* console.log(err); */
- });
+ });
}
- async save(){
- console.log('SAVE');
+ runValidation() {
+ this.validateFrom = true
+ }
+
+ injectValidation() {
+
+ this.Form = new FormGroup({
+ Subject: new FormControl(this.pub.Title, [
+ Validators.required,
+ // Validators.minLength(4)
+ ]),
+ capturedImage: new FormControl(this.capturedImage, [
+
+ ]),
+ Message: new FormControl(this.pub.Message, [
+ Validators.required
+ ])
+ })
+ }
+
+ async save() {
- if(this.publicationType == '3'){
+ this.injectValidation()
+ this.runValidation()
+
+ if(this.Form.invalid) return false
+
+ if(this.publicationType == '3') {
console.log(this.navParams.get('publication'));
if(this.capturedImage != '') {
@@ -139,7 +176,7 @@ export class NewPublicationPage implements OnInit {
}
}
- else{
+ else {
this.publication = {
DateIndex: this.publication.DateIndex,
DocumentId:this.publication.DocumentId,
@@ -165,7 +202,7 @@ export class NewPublicationPage implements OnInit {
}
}
- else{
+ else {
this.publication = {
DateIndex: new Date(),
DocumentId:null,
@@ -194,15 +231,17 @@ export class NewPublicationPage implements OnInit {
}
- close(){
+ close() {
this.modalController.dismiss().then(()=>{
this.showLoader=true;
});
}
- clear(){
+
+ clear() {
this.capturedImage = '';
}
- setTitle(){
+
+ setTitle() {
if(this.publicationType == '1') {
this.publicationTitle = 'Nova Publicação Rápida';
}
@@ -239,4 +278,4 @@ export class NewPublicationPage implements OnInit {
this.photo = this.sanitizer.bypassSecurityTrustResourceUrl(image && (image.dataUrl));
} */
-}
+}
\ No newline at end of file
diff --git a/src/app/pages/publications/publications.module.ts b/src/app/pages/publications/publications.module.ts
index 245306b66..a5dc16845 100644
--- a/src/app/pages/publications/publications.module.ts
+++ b/src/app/pages/publications/publications.module.ts
@@ -7,11 +7,6 @@ import { IonicModule } from '@ionic/angular';
import { PublicationsPageRoutingModule } from './publications-routing.module';
import { PublicationsPage } from './publications.page';
-import { SharedModule } from 'src/app/shared/shared.module';
-import { ViewPublicationsPage } from 'src/app/shared/publication/view-publications/view-publications.page';
-import { NewPublicationPage } from 'src/app/shared/publication/new-publication/new-publication.page';
-import { PublicationDetailPage } from 'src/app/shared/publication/view-publications/publication-detail/publication-detail.page';
-import { NewActionPage } from 'src/app/shared/publication/new-action/new-action.page';
import { ComponentsModule } from 'src/app/components/components.module';
import { ViewPublicationsPageModule } from 'src/app/shared/publication/view-publications/view-publications.module';
import { NewPublicationPageModule } from 'src/app/shared/publication/new-publication/new-publication.module';
@@ -20,7 +15,6 @@ import { PublicationDetailPageModule } from 'src/app/shared/publication/view-pub
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { EditActionPageModule } from 'src/app/shared/publication/edit-action/edit-action.module';
-
@NgModule({
imports: [
CommonModule,
diff --git a/src/app/resolvers/processes-resolver.service.ts b/src/app/resolvers/processes-resolver.service.ts
index 322839b3c..63de8879d 100644
--- a/src/app/resolvers/processes-resolver.service.ts
+++ b/src/app/resolvers/processes-resolver.service.ts
@@ -1,20 +1,21 @@
import { Injectable } from '@angular/core';
-import { ActivatedRoute, ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
import { Observable } from 'rxjs';
-import { DailyWorkTask } from '../models/dailyworktask.model';
import { ProcessesService } from '../services/processes.service';
@Injectable({
providedIn: 'root'
})
-export class ProcessesResolverService implements Resolve
{
+export class ProcessesResolverService implements Resolve {
constructor(
private processesService: ProcessesService,
) { }
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot):
- Observable | Promise | any[] {
+ Observable | Promise | any {
+ /* const n: any = [{numero: '1', n2:'3e'}]
+ return n; */
return this.processesService.GetTasksList("Despacho do Presidente da República", false);
}
}
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html
index a7627682e..797c03bea 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.html
+++ b/src/app/shared/agenda/edit-event/edit-event.page.html
@@ -83,7 +83,7 @@
-
-
+