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

Fix colors

Browse Source
This commit is contained in:
Peter Maquiran
2021-07-26 22:46:33 +01:00
parent d5f4feb484
commit 04fc1f7e7f
10 changed files with 68 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/models/event.model.ts
+2 -1
View File
@@ -18,10 +18,11 @@ export class Event{
IsRecurring: boolean;
AppointmentState: number;
TimeZone: string;
Organizer: string;
Organizer: any
Category: string;
HasAttachments: boolean;
EventRecurrence: EventRecurrence;
Name?: string
/* public Event(){
this.EventRecurrence = new EventRecurrence();
src/app/pages/agenda/agenda.page.html
-2
View File
@@ -222,7 +222,6 @@
</div>
</div>
<div class="fs-timeline flex-grow-1 d-none d-md-block d-md-block text-black pr-20 width-100 height-100 overflow-y-auto" *ngIf="loggeduser.Profile == 'MDGPR'">
<div *ngFor="let events of TimelineMDList | keyvalue;" >
@@ -372,7 +371,6 @@
[eventAttendees]="contacts"
></app-view-event>
<app-event-list
[style.display]="mobileComponent.showEventList ? 'flex' : 'none'"
[profile]="profile"
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+1 -1
View File
@@ -81,7 +81,7 @@
<div class="option-desc">Reencaminhar para Area juridica</div>
<button (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" style="margin-bottom: 0px !important;" shape="round" >Gerar Diploma </button>
<!-- <div class="solid"></div> -->
<div class="option-desc">Outras opcções</div>
<div class="option-desc">Outras opções</div>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+16 -1
View File
@@ -25,7 +25,22 @@
<div class="content-location">
<p>
<span class="location">{{loadedEvent.workflowInstanceDataFields.Location}}</span>
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}">{{loadedEvent.workflowInstanceDataFields.Agenda}}</span>
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Oficial MDGPR' " style="background-color: #ffb703;">
{{loadedEvent.workflowInstanceDataFields.Agenda}}
</span>
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Pessoal MDGPR' " style="background-color: #f05d5e;">
{{loadedEvent.workflowInstanceDataFields.Agenda}}
</span>
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Oficial PR' " style="background-color: #99e47b;">
{{loadedEvent.workflowInstanceDataFields.Agenda}}
</span>
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Pessoal PR' " style="background-color: #958bfc;">
{{loadedEvent.workflowInstanceDataFields.Agenda}}
</span>
</p>
</div>
<div class="content-details">
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
-3
View File
@@ -222,10 +222,7 @@ export class BookMeetingModalPage implements OnInit {
this.runValidation()
}
// if(this.Form.invalid) return false
alert('!')
let Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
src/app/shared/agenda/approve-event/approve-event.page.html
+17 -2
View File
@@ -32,7 +32,22 @@
<div class="content-location">
<p>
<span class="location">{{loadedEvent.workflowInstanceDataFields.Location}}</span>
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}">{{loadedEvent.workflowInstanceDataFields.Agenda}}</span>
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Oficial MDGPR' " style="background-color: #ffb703;">
{{loadedEvent.workflowInstanceDataFields.Agenda}}
</span>
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Pessoal MDGPR' " style="background-color: #f05d5e;">
{{loadedEvent.workflowInstanceDataFields.Agenda}}
</span>
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Oficial PR' " style="background-color: #99e47b;">
{{loadedEvent.workflowInstanceDataFields.Agenda}}
</span>
<span class="event-type-{{loadedEvent.workflowInstanceDataFields.Agenda}}" *ngIf="loadedEvent.workflowDisplayName == 'Agenda Pessoal PR' " style="background-color: #958bfc;">
{{loadedEvent.workflowInstanceDataFields.Agenda}}
</span>
</p>
</div>
<div class="content-details">
@@ -78,7 +93,7 @@
</ion-item>
</ion-list>
</div>
</div>
</div>
src/app/shared/agenda/approve-event/approve-event.page.ts
+11
View File
@@ -65,6 +65,17 @@ export class ApproveEventPage implements OnInit {
ngOnChanges() {
this.getTask();
this.getAttachments();
setTimeout(()=>{
this.getTask();
this.getAttachments();
}, 4000)
setTimeout(()=>{
this.getTask();
this.getAttachments();
}, 6000)
}
notImplemented() {
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
+3 -5
View File
@@ -255,6 +255,8 @@ export class EditEventToApprovePage implements OnInit {
async save() {
this.close()
this.injectValidation()
this.runValidation()
@@ -263,8 +265,6 @@ export class EditEventToApprovePage implements OnInit {
// set dates to eventProcess object
this.getDatepickerData()
this.taskParticipantsCc.forEach( e => {
e.IsRequired = false
})
@@ -300,11 +300,9 @@ export class EditEventToApprovePage implements OnInit {
ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList,
}
console.log(event);
try {
await this.eventsService.postEventToApproveEdit(event).toPromise()
this.close()
this.toastService.successMessage('Evento editado');
src/app/shared/agenda/event-list/event-list.page.ts
+4 -5
View File
@@ -45,8 +45,6 @@ export class EventListPage implements OnInit {
this.segment = this.loggeduser.Profile;
//this.LoadToApproveEvents();
const pathname = window.location.pathname
this.router.events.forEach((event) => {
@@ -102,10 +100,11 @@ export class EventListPage implements OnInit {
this.LoadToApproveEvents();
console.log('refresh');
setTimeout(() => {
event.target.complete();
}, 2000);
event.target.complete();
}, 2000);
}
close(){
close() {
console.log('close')
this.cloneAllmobileComponent.emit();
}
src/app/shared/agenda/view-event/view-event.page.html
+14 -1
View File
@@ -29,7 +29,20 @@
<div class="main-content">
<div class="upper-content">
<div class="content-location">
<p><span class="date">{{loadedEvent.Location}}</span><span class="label">{{loadedEvent.CalendarName}}</span></p>
<span class="date">{{loadedEvent.Location}}</span>
<div *ngIf="loadedEvent.Organizer.Name == 'Agenda do Presidente da República' ">
<span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' " style="background-color: #99e47b;">{{loadedEvent.CalendarName}}</span>
<span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #958bfc;">{{loadedEvent.CalendarName}}</span>
</div>
<div *ngIf="loadedEvent.Organizer.Name == 'Agenda do Ministro e Director do Gabinete do PR' ">
<span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' " style="background-color: #ffb703;">{{loadedEvent.CalendarName}}</span>
<span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #f05d5e;">{{loadedEvent.CalendarName}}</span>
</div>
</div>
<div class="content-details">
<ion-label>