diff --git a/src/app/app.module.ts b/src/app/app.module.ts index a88262399..a1681cb40 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -18,7 +18,6 @@ import { WebView } from '@ionic-native/ionic-webview/ngx'; import { FilePath } from '@ionic-native/file-path/ngx'; import { Camera } from '@ionic-native/camera/ngx'; import { IonicStorageModule } from '@ionic/storage'; -import { PipesModule } from './pipes/pipes.module'; // import { CommonModule } from '@angular/common'; @@ -44,7 +43,6 @@ import { MessagesPage } from './pages/chat/messages/messages.page'; IonicModule.forRoot(), IonicStorageModule.forRoot(), AppRoutingModule, - PipesModule, HttpClientModule, ], providers: [ diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts index 7aec81219..f0e7dabda 100644 --- a/src/app/pages/agenda/agenda.module.ts +++ b/src/app/pages/agenda/agenda.module.ts @@ -26,6 +26,7 @@ registerLocaleData(localeDe); import { CalendarModule, DateAdapter } from 'angular-calendar'; import { adapterFactory } from 'angular-calendar/date-adapters/date-fns'; +import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page'; @NgModule({ imports: [ CommonModule, @@ -50,6 +51,10 @@ import { adapterFactory } from 'angular-calendar/date-adapters/date-fns'; ApproveEventComponent, AttendeesPage, AttendeeModalPage, + EventsToApprovePage, + ], + entryComponents: [ + EventsToApprovePage, ], schemas: [CUSTOM_ELEMENTS_SCHEMA], providers: [ diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index a8c9d82d4..6d122b19e 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -368,9 +368,17 @@ (approveEventDismiss) = "approveEventDismiss($event)" (cloneAllmobileComponent)="viewEventDetailDismiss($event)" > - + + +
- +
- - - + Seu calendário @@ -33,7 +25,7 @@ -
+
@@ -41,7 +33,7 @@ -
+

{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}

{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}

@@ -62,7 +54,7 @@ -
+

{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}

{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}

diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.scss b/src/app/pages/gabinete-digital/event-list/event-list.page.scss index de6e94ceb..b5dbc6081 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.scss +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.scss @@ -1,7 +1,11 @@ + +:host{ + padding: 30px 20px 0 20px !important; + margin: 0; +} .header-content{ + margin: 0 !important; overflow: auto; - margin: 0 auto; - padding-top: 25px; } .header-icon-left{ width: 36px; @@ -10,10 +14,10 @@ float: left; } .header-title{ - width: 300px; + //width: 300px; font-family: Roboto; font-size: 25px; - margin: 0 5px 0 5px; + //margin: 0 5px 0 5px; padding: 0; color:#000; float: left; @@ -22,7 +26,7 @@ ion-item-sliding{ margin-top: 5px; } .Rectangle { - width: 360px; + //width: 360px; border-radius: 15px; box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); border: solid 1px #e9e9e9; @@ -32,26 +36,24 @@ ion-item-sliding{ margin-bottom: 10px; overflow: auto; } -.content-mdgpr-Oficial{ - width: 340px; +.content-pr-Oficial{ + background-color: var(--white); border-radius: 5px; border-right: 5px solid #99e47b; overflow: auto; } -.content-mdgpr-Pessoal{ - width: 340px; +.content-pr-Pessoal{ + background-color: var(--white); border-radius: 5px; border-right: 5px solid #958bfc; overflow: auto; } -.content-pr-Oficial{ - width: 340px; +.content-mdgpr-Oficial{ border-radius: 5px; border-right: 5px solid #ffb703; overflow: auto; } -.content-pr-Pessoal{ - width: 340px; +.content-mdgpr-Pessoal{ border-radius: 5px; border-right: 5px solid #f05d5e; overflow: auto; @@ -78,7 +80,7 @@ ion-item-sliding{ margin-left: 10px; } .approve-event-detail p{ - width: 250px; + //width: 250px; font-family: Roboto; font-size: 13px; font-weight: normal; @@ -91,7 +93,7 @@ ion-item-sliding{ padding: 0; } .approve-event-detail h3{ - width: 250px; + //width: 250px; font-family: Roboto; font-size: 15px; font-weight: bold; diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index 9f683ff49..c3fb15702 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -13,7 +13,7 @@ import { NavigationEnd, Router } from '@angular/router'; styleUrls: ['./event-list.page.scss'], }) export class EventListPage implements OnInit { - segment:string; + profile:string; showLoader: boolean; eventsPRList: any; eventsMDGPRList: any; @@ -29,11 +29,11 @@ export class EventListPage implements OnInit { private router: Router, private navParams: NavParams, ) { } -S + ngOnInit() { - this.segment = this.navParams.get('segment'); + this.profile = this.navParams.get('profile'); /* console.log(this.navParams.get('md')); */ - console.log(this.segment); + console.log(this.profile); this.LoadToApproveEvents(); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 211d1c35f..41549e644 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -70,7 +70,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 8073fc452..16aecaf24 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -149,11 +149,11 @@ ion-content{ -@media only screen and (min-width: 1024px) { +@media only screen and (min-width: 801px) { .main-content{ .aside-wrapper{ - width: 40%; + width: 35%; justify-content: flex-start !important; border-right: 1px solid #d8d8d8; .aside-title{ @@ -163,7 +163,7 @@ ion-content{ } } .aside-content{ - width: 60%; + width: 65%; display: flex !important; background-color: white; } @@ -198,3 +198,23 @@ ion-content{ } } } +@media only screen and (min-width: 1024px){ + .content{ + width: 70%; + } + .aside-right{ + width: 30%; + } +} +@media only screen and (min-width: 1140px) { + .div-icon{ + display: none; + } + .content{ + width: 75%; + border-right: 1px solid #d8d8d8; + } + .aside-right{ + width: 25%; + } +} diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index e195887c3..c3ee3e6d9 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -83,7 +83,7 @@ export class GabineteDigitalPage implements OnInit { } ngOnInit() { //Initialize profile as mdgpr - this.profile = "mdgpr"; + this.profile = "MDGPR"; this.LoadCounts(); /* this.eventService.getAllMdEvents.subscribe(res=>{ console.log(res); @@ -138,17 +138,17 @@ this.processesbackend.GetActionsList().subscribe(res=>{ this.alertService.presentAlert('Funcionalidade em desenvolvimento'); } - openEventsToApprovePage(segment:any){ + openEventsToApprovePage(profile:any){ this.closeAllDesktopComponents(); if( window.innerWidth <= 1024){ - this.openEventsToApproveList(segment); + this.openEventsToApproveList(profile); } else{ this.showEventsToApprove = true; } } - async openEventsToApproveList(segment:any){ + async openEventsToApproveList(profile:any){ this.closeAllDesktopComponent(); @@ -164,7 +164,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{ const modal = await this.modalController.create({ component: EventListPage, componentProps:{ - segment: segment, + profile: profile, }, cssClass: classs, backdropDismiss: false diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index ab50275a4..897ab45fe 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -10,12 +10,12 @@ -
+
-
+
-
+
Ações Presidenciais @@ -58,8 +58,7 @@
-
+
Nenhuma ação presidencial selecionado
+ )">
Nenhuma ação presidencial selecionada
{ @@ -52,7 +52,7 @@ export class SenderPage implements OnInit { this.close(this.selectedUser); } - close(username: string){ + close(username?: string){ this.modalController.dismiss(username); } diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html index 08fb441e7..77933ac48 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html @@ -2,7 +2,7 @@
- + Seu calendário @@ -17,7 +17,7 @@ -
+
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index c07018dd9..93c3b1d1c 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -23,7 +23,7 @@ export class EventsToApprovePage implements OnInit { categories: string[]; serialnumber:string; - @Input() segment:string; + @Input() profile:string; constructor( private processes:ProcessesService, @@ -35,9 +35,8 @@ S ngOnInit() { //this.segment = this.navParams.get('segment'); /* console.log(this.navParams.get('md')); */ - console.log(this.segment); + console.log(this.profile); this.LoadToApproveEvents(); - this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { diff --git a/src/global.scss b/src/global.scss index f2de22b0f..8a7b43e87 100644 --- a/src/global.scss +++ b/src/global.scss @@ -312,6 +312,9 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- width: 100%; } */ } +.app-default-padding{ + padding: 30px 20px 0 20px !important; +} .showAsideOptions{ @media only screen and (min-width: 801px) { diff --git a/src/style/main.scss b/src/style/main.scss index a50579d1b..a54c700b9 100644 --- a/src/style/main.scss +++ b/src/style/main.scss @@ -208,6 +208,7 @@ .max-width-md-60{max-width: 60%;} .max-width-md-50{max-width: 50%;} .max-width-md-40{max-width: 40%;} +.max-width-md-35{max-width: 35%;} .max-width-md-30{max-width: 30%;} .max-width-md-20{max-width: 20%;} .max-width-md-10{max-width: 10%;} @@ -383,9 +384,11 @@ .max-width-80{max-width: 80%;} .max-width-70{max-width: 70%;} .max-width-60{max-width: 60%;} +.max-width-65{max-width: 65%;} .max-width-50{max-width: 50%;} .max-width-45{max-width: 45%;} .max-width-40{max-width: 40%;} +.max-width-35{max-width: 35%;} .max-width-30{max-width: 30%;} .max-width-20{max-width: 20%;} .max-width-10{max-width: 10%;}