peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 21:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
Tiago Kayaya
2020-11-26 05:41:54 +01:00
parent d1214e0313
commit 65dae85c64
22 changed files with 266 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/event-list/event-list.page.html
+4 -2
View File
@@ -46,7 +46,8 @@
<p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
</div>
<div class="approve-event-detail">
<p>{{event.workflowInstanceDataFields.Location}}</p>
<p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/mm/yy'}} | {{event.workflowInstanceDataFields.Location}}</p>
<p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</p>
<h3>{{event.workflowInstanceDataFields.Subject}}</h3>
</div>
</div>
@@ -66,7 +67,8 @@
<p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
</div>
<div class="approve-event-detail">
<p>{{event.workflowInstanceDataFields.Location}}</p>
<p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/mm/yy'}} | {{event.workflowInstanceDataFields.Location}}</p>
<p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</p>
<h3>{{event.workflowInstanceDataFields.Subject}}</h3>
</div>
</div>
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+4 -4
View File
@@ -164,15 +164,15 @@
</ion-label>
</div>
<div>
<div *ngIf="loadedAttachments">
<ion-item>
<ion-label>Documentos Anexados</ion-label>
</ion-item>
<ion-list>
<ion-item>
<ion-item *ngFor="let attachment of loadedAttachments">
<ion-label>
<p class="attach-title-item">{{task.Folio}}</p>
<p><span class="span-left">OAPR - GTI</span><span class="span-right">{{ task.CreateDate| date: 'dd/MM/yyyy' }}</span></p>
<h4 class="attach-title-item">{{attachment.Description}}</h4>
<p><span class="span-left">{{attachment.Stakeholders}}</span><span class="span-right"> {{ attachment.CreateDate | date: 'dd/MM/yyyy' }}</span></p>
</ion-label>
</ion-item>
</ion-list>
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+12 -1
View File
@@ -9,6 +9,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
import { EventPerson } from 'src/app/models/eventperson.model';
import { EventsService } from 'src/app/services/events.service';
import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
import { AttachmentsService } from 'src/app/services/attachments.service';
@Component({
selector: 'app-book-meeting-modal',
@@ -20,6 +21,7 @@ export class BookMeetingModalPage implements OnInit {
taskParticipants: any;
taskParticipantsCc: any;
taskDocId:string;
loadedAttachments:any;
postData: Event;
eventBody: EventBody;
@@ -32,6 +34,7 @@ export class BookMeetingModalPage implements OnInit {
private router:Router,
private navParams: NavParams,
private processes:ProcessesService,
private attachmentsService: AttachmentsService,
private calendarService: EventsService,
) {
this.task = this.navParams.get('task');
@@ -52,6 +55,14 @@ export class BookMeetingModalPage implements OnInit {
ngOnInit() {
console.log(this.task)
console.log(this.task.SerialNumber);
this.getAttachments();
}
getAttachments(){
this.attachmentsService.getAttachmentsBySerial(this.task.SerialNumber).subscribe(res=>{
this.loadedAttachments = res;
console.log(res);
});
}
close(){
@@ -89,7 +100,7 @@ export class BookMeetingModalPage implements OnInit {
this.processes.FindTaskDocId(this.task.SerialNumber).subscribe(res =>{
if(res){
this.calendarService.postExpedientEvent(res, this.postData, "md",this.task.SerialNumber);
this.calendarService.postExpedientEvent(res, this.postData, "pr",this.task.SerialNumber);
}
});
this.distartExpedientModal();
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+4 -4
View File
@@ -86,15 +86,15 @@
</ion-label>
</div>
<div>
<div *ngIf="loadedAttachments">
<ion-item>
<ion-label>Documentos Anexados</ion-label>
</ion-item>
<ion-list>
<ion-item>
<ion-item *ngFor="let attachment of loadedAttachments">
<ion-label>
<h4 class="attach-title-item">{{task.workflowInstanceFolio}}</h4>
<p><span class="span-left">OAPR - GTI</span><span class="span-right"> {{ taskDate | date: 'dd/MM/yyyy' }}</span></p>
<h4 class="attach-title-item">{{attachment.Description}}</h4>
<p><span class="span-left">{{attachment.Stakeholders}}</span><span class="span-right"> {{ attachment.CreateDate | date: 'dd/MM/yyyy' }}</span></p>
</ion-label>
</ion-item>
</ion-list>
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+13 -2
View File
@@ -12,6 +12,7 @@ import { AddParticipantsCcModalPage } from '../add-participants-cc-modal/add-par
import { AddParticipantsModalPage } from '../add-participants-modal/add-participants-modal.page';
import { environment } from 'src/environments/environment';
import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
import { AttachmentsService } from 'src/app/services/attachments.service';
@Component({
selector: 'app-expedient-task-modal',
@@ -32,6 +33,7 @@ export class ExpedientTaskModalPage implements OnInit {
taskDate: Date;
taskDescription: string;
user: string;
loadedAttachments:any;
postData: Despacho;
dispatchFolder: Folder;
@@ -41,6 +43,7 @@ export class ExpedientTaskModalPage implements OnInit {
private modalController: ModalController,
private router:Router,
private processes:ProcessesService,
private attachmentsService: AttachmentsService,
private navParams: NavParams,
private authService: AuthService,
) {
@@ -53,9 +56,9 @@ export class ExpedientTaskModalPage implements OnInit {
Nad: 30,
Subject: '',
Message: '',
SourceSecFsId: '8',
SourceSecFsId: this.task.workflowInstanceDataFields.FsId,
SouceType: 'DOC',
SourceId: '',
SourceId: this.task.workflowInstanceDataFields.DocId,
};
this.postData.DispatchFolder = this.dispatchFolder;
@@ -73,7 +76,9 @@ export class ExpedientTaskModalPage implements OnInit {
});
console.log(this.user); */
console.log(this.task)
console.log(this.task.serialNumber);
this.getAttachments();
}
@@ -128,6 +133,12 @@ export class ExpedientTaskModalPage implements OnInit {
this.distartExpedientModal();
this.close();
}
getAttachments(){
this.attachmentsService.getAttachmentsBySerial(this.task.serialNumber).subscribe(res=>{
this.loadedAttachments = res;
console.log(res);
});
}
async addParticipants(){
const modal = await this.modalController.create({
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+1 -1
View File
@@ -61,7 +61,7 @@
</ion-item>
<ion-item>
<ion-label position="stacked">Remetentes</ion-label>
<ion-input disabled="true">OAPR - GTI</ion-input><!-- {{ task.Senders }} -->
<ion-input disabled="true">{{task.Remetente}}</ion-input><!-- {{ task.Senders }} -->
</ion-item>
<ion-item>
<ion-label position="stacked">Data</ion-label>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+10 -9
View File
@@ -29,7 +29,7 @@ export class ExpedienteDetailPage implements OnInit {
private modalController: ModalController,
private alertService: AlertService) { }
task: DailyWorkTask;
task: any;
fulltask:any;
eventsList: Event[];
serialnumber:string;
@@ -48,16 +48,17 @@ export class ExpedienteDetailPage implements OnInit {
async LoadTaskDetail(serial:string)
{
this.processes.GetTask(serial).subscribe(result => {
this.processes.GetTask(serial).subscribe(res => {
this.task = {
"SerialNumber": result.serialNumber,
"Folio": result.workflowInstanceFolio,
"Senders": result.originator.email,
"CreateDate": formatDate(new Date(result.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": result.formURL
"SerialNumber": res.serialNumber,
"Folio": res.workflowInstanceFolio,
"Senders": res.originator.email,
"CreateDate": formatDate(new Date(res.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": res.formURL,
"Remetente": res.workflowInstanceDataFields.Remetente
}
this.fulltask = result;
/* console.log(result); */
this.fulltask = res;
console.log(res);
});
}
src/app/pages/gabinete-digital/expediente/expediente.page.html
+1 -1
View File
@@ -37,7 +37,7 @@
<ion-icon slot="end" name="calendar"></ion-icon>
<h3>{{ task.Folio }}</h3>
</ion-item>
<p><span class="span-left">OAPR - GTI</span><span class="span-right">{{ task.CreateDate | date: 'dd-MM-yy' }}</span></p>
<p><span class="span-left">{{task.Remetente}}</span><span class="span-right">{{ task.CreateDate | date: 'dd-MM-yy' }}</span></p>
<!-- <p><span class="span-left">{{ task.Senders }}</span><span class="span-right">{{ task.CreateDate | date: 'dd-MM-yy' }}</span></p> -->
</div>
</ion-item>
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+2 -1
View File
@@ -41,7 +41,8 @@ export class ExpedientePage implements OnInit {
"Folio": element.workflowInstanceFolio,
"Senders": element.originator.email,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.formURL
"DocumentURL": element.formURL,
"Remetente": element.workflowInstanceDataFields.Remetente
}
this.taskslist.push(task);
});
src/app/pages/gabinete-digital/gabinete-digital.page.html
+5 -5
View File
@@ -10,7 +10,7 @@
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<ion-card color="#d4d5ca">
<!-- <ion-card color="#d4d5ca">
<ion-card-header>
<ion-card-title>Eventos para Aprovação</ion-card-title>
<ion-card-content>
@@ -18,13 +18,13 @@
<ion-label>Minha agenda</ion-label>
<ion-button slot="end">{{count_ev_md}}</ion-button>
</ion-item>
<ion-item (click)="openEventsToApproveList('PR')" class="ion-item-change-color"><!-- [routerLink]="['/home/gabinete-digital/event-list', 'pr']" -->
<ion-item (click)="openEventsToApproveList('PR')" class="ion-item-change-color">
<ion-label>Agenda do Presidente</ion-label>
<ion-button slot="end">{{count_ev_pr}}</ion-button>
</ion-item>
</ion-card-content>
</ion-card-header>
</ion-card>
</ion-card> -->
<ion-card color="#d4d5ca">
<ion-card-header>
<ion-card-title>Expediente</ion-card-title>
@@ -44,7 +44,7 @@
</ion-card-content>
</ion-card-header>
</ion-card>
<ion-card color="#d4d5ca">
<!-- <ion-card color="#d4d5ca">
<ion-card-header>
<ion-card-title>Expediente para o PR</ion-card-title>
<ion-card-content>
@@ -80,6 +80,6 @@
</ion-item>
</ion-card-content>
</ion-card-header>
</ion-card>
</ion-card> -->
</ion-content>
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+2 -2
View File
@@ -42,9 +42,9 @@ export class GabineteDigitalPage implements OnInit {
LoadCounts() {
this.showLoader = true;
this.processesbackend.GetTasksList("Expediente", true).subscribe(result =>{
this.processesbackend.GetTasksList("Expediente", true).subscribe(res =>{
this.showLoader = false;
this.count_exp_dailywork = result;
this.count_exp_dailywork = res;
});
this.processesbackend.GetToApprovedEvents('PR','true').subscribe(res=>{
this.count_ev_pr = res;