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

Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-06-15 11:58:40 +01:00
parent dd813618f6 736c0ab416
commit 58354b0282
21 changed files with 346 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.module.ts
+1 -10
View File
@@ -12,14 +12,6 @@ import { CalModalPageModule } from '../cal-modal/cal-modal.module';
import { registerLocaleData } from '@angular/common';
import localeDe from '@angular/common/locales/pt';
import { SharedModule } from 'src/app/shared/shared.module';
import { NewEventPage } from "src/app/shared/agenda/new-event/new-event.page"
import { EditEventPage } from 'src/app/shared/agenda/edit-event/edit-event.page';
import { ViewEventPage } from 'src/app/shared/agenda/view-event/view-event.page';
import { EventListPage } from "src/app/shared/agenda/event-list/event-list.page";
import { AttendeesPage } from 'src/app/shared/event/attendees/attendees.page';
import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page';
registerLocaleData(localeDe);
@@ -28,7 +20,7 @@ import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page';
import { ComponentsModule } from 'src/app/components/components.module';
import { AttendeesPageModule } from '../events/attendees/attendees.module';
import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { ViewEventPageModule } from 'src/app/shared/agenda/view-event/view-event.module';
@@ -58,7 +50,6 @@ import { EditEventPageModule } from 'src/app/shared/agenda/edit-event/edit-event
// entryComponents
HeaderPageModule,
ViewEventPageModule,
AttendeesPageModule,
AttendeeModalPageModule,
EventsToApprovePageModule,
ApproveEventPageModule,
src/app/pages/agenda/agenda.page.html
+3 -3
View File
@@ -213,7 +213,7 @@
</div>
</div> -->
<div class="ss-timeline hide-scroll timeline-mobile flex-grow-1 d-md-none text-black height-100 width-100 overflow-y-auto" >
<div class="ss-timeline timeline-mobile flex-grow-1 d-md-none text-black height-100 width-100 overflow-y-auto" >
<div *ngFor="let events of TimelineMDList | keyvalue;" >
<div *ngIf="CalendarCurrentDay <= events.key">
@@ -256,7 +256,7 @@
</div>
</div>
<div class="fs-timeline hide-scroll 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 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;" >
<div *ngIf="CalendarCurrentDay <= events.key">
@@ -297,7 +297,7 @@
</div>
</div>
<div class="sd-timeline hide-scroll flex-grow-1 d-none d-md-block timeline-md text-black pl-20 width-100 height-100 overflow-y-auto" >
<div class="sd-timeline flex-grow-1 d-none d-md-block timeline-md text-black pl-20 width-100 height-100 overflow-y-auto" >
<div *ngFor="let events of TimelinePRList | keyvalue;">
<div *ngIf="CalendarCurrentDay <= events.key">
src/app/pages/agenda/agenda.page.ts
-1
View File
@@ -738,7 +738,6 @@ export class AgendaPage implements OnInit {
case "Oficial":
alert('Oficial')
//Inicializa o array eventSource
this.eventsListOficial = [];
src/app/pages/agenda/edit-event/edit-event.page.html
+1 -1
View File
@@ -93,7 +93,7 @@
</div>
</div>
</div>
<div class="container-div width-100">
<div class="ion-item-class-2">
<div class="ion-icon-class">
src/app/pages/events/attendee-modal/attendee-modal.page.ts
+4 -4
View File
@@ -21,15 +21,15 @@ export class AttendeeModalPage implements OnInit {
this.fetchContacts("");
}
save(){
save() {
this.modalCtrl.dismiss(
this.contacts.filter(function(contact) {
return contact.IsRequired == true;
})
return contact.IsRequired == true;
})
);
}
close(){
close() {
this.modalCtrl.dismiss(null);
}
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+7 -6
View File
@@ -20,6 +20,7 @@ import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
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 { DespachosOptionsPage } from 'src/app/shared/popover/despachos-options/despachos-options.page';
@Component({
selector: 'app-despacho',
@@ -62,7 +63,7 @@ export class DespachoPage implements OnInit {
}
});
}
}
ngOnInit() {
this.profile = "mdgpr";
@@ -90,11 +91,11 @@ export class DespachoPage implements OnInit {
let navigationExtras: NavigationExtras = {
queryParams: {
// "serialNumber": serialNumber,
'despachos': true
//'despachos': true
}
}
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
this.router.navigate(['/home/gabinete-digital/despachos'], navigationExtras);
}
@@ -428,13 +429,14 @@ export class DespachoPage implements OnInit {
}
async openOptions(taskAction?: any) {
const popover = await this.popoverController.create({
component: OptsExpedientePage,
component: DespachosOptionsPage,
cssClass: 'exp-options',
componentProps: {
task: this.task,
fulltask: this.fulltask,
taskAction:taskAction,
taskAction: taskAction,
showEnviarPendentes: false
},
translucent: true
@@ -442,7 +444,6 @@ export class DespachoPage implements OnInit {
return await popover.present();
}
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts
-3
View File
@@ -8,7 +8,6 @@ import { BookMeetingModalPageRoutingModule } from './book-meeting-modal-routing.
import { BookMeetingModalPage } from './book-meeting-modal.page';
import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page';
import { AttendeesPageModule } from 'src/app/shared/event/attendees/attendees.module';
import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
@@ -19,8 +18,6 @@ import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/att
FormsModule,
IonicModule,
BookMeetingModalPageRoutingModule,
//
// AttendeesPageModule,
EmptyContainerPageModule,
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts
-2
View File
@@ -9,7 +9,6 @@ import { ExpedientTaskModalPageRoutingModule } from './expedient-task-modal-rout
import { ExpedientTaskModalPage } from './expedient-task-modal.page';
import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page';
import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-container.page';
import { AttendeesPageModule } from 'src/app/shared/event/attendees/attendees.module';
import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
@@ -21,7 +20,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
IonicModule,
ExpedientTaskModalPageRoutingModule,
//
AttendeesPageModule,
AttendeeModalPageModule,
EmptyContainerPageModule,
BtnModalDismissPageModule,