-
+
-
+
{{ TimelineDayEvent(events.key)}}
@@ -271,7 +271,7 @@
-
+
{{event.event.StartDate | date: 'HH:mm'}}
--
@@ -281,7 +281,7 @@
Todo
o dia
-
+
{{event.event.Location}}
-
-
{{event.event.Subject}}
+
+
{{event.event.Subject}}
@@ -323,7 +323,7 @@
class="text-black nothing-to-show">
Nenhum evento selecionado
-
+
-
-
-
-
+
-
-
\ No newline at end of file
+
+
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index f695b79d2..3704b7140 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -6,13 +6,13 @@
border-radius: 5px;
display: table-cell;
}
-
+
:host ::ng-deep {
.monthview-primary-with-event {
/* background-color: white !important; */
}
-
+
.monthview-current{
/* background-color: red; */
border-bottom: 1px solid lightskyblue !important;
@@ -30,7 +30,7 @@
margin-left: 1px solid red;
}
}
-
+
.main-header{
width: 100%; /* 400px */
@@ -43,7 +43,7 @@
padding: 15px 5px 0px 5px;
color:#000;
transform: translate3d(0, 1px, 0);
-
+
.title-content{
width: 360px;
margin: 0px auto;
@@ -129,7 +129,7 @@ input:checked + .slider:before {
{
display: none;
text-align: left !important;
- left: 25px !important;
+ left: 25px !important;
color: white;
}
.mdgpr
@@ -163,7 +163,7 @@ input:checked + .slider .mdgpr
/* Rounded sliders */
.slider.round {
border-radius: 34px;
-
+
}
.slider.round:before {
@@ -293,7 +293,7 @@ td.monthview-primary-with-event {
}
.segment {
-
+
}
/* Timeline */
@@ -313,7 +313,7 @@ td.monthview-primary-with-event {
.arrow-down{
font-size: 28px;
}
-
+
}
@@ -471,7 +471,7 @@ td.monthview-primary-with-event {
padding: 0px 10px !important;
}
-
+
.schedule-time{
margin-right: 10px;
min-width: 33px;
@@ -504,7 +504,7 @@ td.monthview-primary-with-event {
font-family: Roboto;
font-size: 13px;
color: black;
-
+
}
.description{
width: 100%;
@@ -568,7 +568,7 @@ td.monthview-primary-with-event {
border-right: 5px solid #f05d5e;
overflow: auto;
}
-
+
}
.calendar-timeline{
@@ -612,7 +612,7 @@ td.monthview-primary-with-event {
.timeline-wrapper{
width: 100%;
overflow: auto;
- // overflow-x: hidden;
+ // overflow-x: hidden;
}
}
}
@@ -632,7 +632,7 @@ td.monthview-primary-with-event {
@media only screen and (min-width: 1024px) {
.container-wrapper{
height: 100%;
-
+
.calendar-timeline{
border-top-right-radius: 0px;
width: calc(100% - 40%);
diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html
index b5352d06b..e30169a18 100644
--- a/src/app/shared/agenda/event-list/event-list.page.html
+++ b/src/app/shared/agenda/event-list/event-list.page.html
@@ -4,7 +4,7 @@
+
-
-
+
+
-
diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts
index 19f64b4a7..ed2b8f2a3 100644
--- a/src/app/shared/agenda/event-list/event-list.page.ts
+++ b/src/app/shared/agenda/event-list/event-list.page.ts
@@ -5,6 +5,8 @@ import { Event } from 'src/app/models/event.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { ModalController, NavParams } from '@ionic/angular';
import { NavigationEnd, Router } from '@angular/router';
+import { AuthService } from 'src/app/services/auth.service';
+import { User } from 'src/app/models/user.model';
@Component({
selector: 'app-event-list',
@@ -21,6 +23,8 @@ export class EventListPage implements OnInit {
eventBody: EventBody;
categories: string[];
serialnumber:string;
+ loggeduser: User;
+ segment:string;
@Input() profile:string;
@Output() cloneAllmobileComponent = new EventEmitter
();
@@ -31,22 +35,19 @@ export class EventListPage implements OnInit {
private processes:ProcessesService,
private modalController: ModalController,
private router: Router,
- ) { }
+ private userAuth: AuthService,
+ ) {
+ this.loggeduser = userAuth.ValidatedUser;
+ }
ngOnInit() {
- /* console.log(this.profile); */
+ this.segment = this.loggeduser.Profile;
- if(this.profile == "mdgpr") {
- this.profile = 'MDGPR'
- } else {
- this.profile = 'PR'
- }
+ //this.LoadToApproveEvents();
- this.LoadToApproveEvents();
-
const pathname = window.location.pathname
-
+
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == pathname) {
this.LoadToApproveEvents();
@@ -54,18 +55,26 @@ export class EventListPage implements OnInit {
});
}
- LoadToApproveEvents() {
- this.showLoader = true;
-
- this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
- this.showLoader = false;
- this.eventsPRList = res;
- });
- this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{
- this.showLoader = false;
- this.eventsMDGPRList = res;
- });
+ segmentChanged(ev: any) {
+ this.LoadToApproveEvents();
}
+
+ async LoadToApproveEvents() {
+ this.showLoader = true;
+ console.log(this.segment);
+ if(this.segment == 'MDGPR'){
+ let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
+ let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
+ this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
+ }
+ else if(this.segment == 'PR'){
+ let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
+ let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
+ this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
+ }
+ this.showLoader = false;
+ }
+
async openApproveModal(eventSerialNumber, data) {
let a =this.eventsMDGPRList.filter((elem)=>{
@@ -73,9 +82,9 @@ export class EventListPage implements OnInit {
return eventSerialNumber == elem.serialNumber
});
- this.approveEventDismiss.emit({
+ this.approveEventDismiss.emit({
"serialNumber": eventSerialNumber,
- "action": "Aprovar",
+ "action": "Aprovar",
"saveData": data
});
}
diff --git a/src/global.scss b/src/global.scss
index 432b80cf6..8d55075db 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -62,7 +62,7 @@ td.monthview-current{
td.monthview-selected {
background-color: lightskyblue !important;
color: white !important;
-}
+}
td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-dwf-c153] {
background-color: white !important;
@@ -86,7 +86,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
.cal-hour-segment {
border-bottom: none !important;
}
-
+
.cal-current-time-marker {
background-color: #42b9fe !important;
}
@@ -216,7 +216,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
font-size: 36px
}
-
+
/* angular-cli file: src/styles.css */
@import "../node_modules/angular-calendar/css/angular-calendar.css";
@import "./style/main.scss";
@@ -266,7 +266,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
height: unset !important;
}
}
-
+
.modal-desktop{
.modal-wrapper{
@@ -275,7 +275,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
}
}
-@media screen and (min-width: 1200px) {
+@media screen and (min-width: 1200px) {
.hide-desktop{
display: none !important;
}
@@ -306,7 +306,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
width: 100%;
border-right: 1px solid #d8d8d8;
}
-
+
.aside-right{
display: none;
}
@@ -332,7 +332,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
width: 65%;
border-right: 1px solid #d8d8d8;
}
-
+
.aside-right{
width: 35%;
}
@@ -353,7 +353,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
width: 75%;
border-right: 1px solid #d8d8d8;
}
-
+
.aside-right{
width: 25%;
}
@@ -524,7 +524,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
}
}
-
+
.search-submodal{
background-color: rgb(0 0 0 / 55%);
}
@@ -572,7 +572,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
.cal-current-time-marker::before {
display: none !important;
}
-
+
.timeline-box{
left: -13%;
position: relative;
@@ -589,7 +589,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
.calendar-component .monthview-container table.table {
-
+
td {
width: 50px;
height: 40px;
@@ -621,8 +621,8 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
-moz-border-radius: 3px !important;
-ms-border-radius: 3px !important;
-o-border-radius: 3px !important;
- }
-
+ }
+
.attendee-search-bar .searchbar-input {
border: 1px solid #cecece !important;
box-shadow: none !important;
@@ -654,8 +654,8 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
// center
-app-diploma-assinar ion-content .main-content,
-app-approve-event ion-content .main-content,
+app-diploma-assinar ion-content .main-content,
+app-approve-event ion-content .main-content,
app-view-event ion-content .main-content,
app-expediente-pr .main-content{
max-width: 1366px !important;
@@ -762,7 +762,7 @@ ion-content {
right: 0 !important;
top: calc(100% - 160px) !important;
max-height: 160px;
- min-height: 160px;
+ min-height: 160px;
}
@@ -783,11 +783,11 @@ ion-icon{
width: 500px;
height: fit-content;
height: 300px;
- }
+ }
}
-@media only screen and (max-width: 500px) {
+@media only screen and (max-width: 500px) {
::-webkit-scrollbar {
width: 5px !important;
@@ -800,7 +800,7 @@ ion-icon{
width: 7px;
height: 7px;
}
-
+
/* Track */
::-webkit-scrollbar-track {
background: #f1f1f1;
@@ -831,7 +831,7 @@ background: rgb(92, 92, 92);
.hide-scroll::-webkit-scrollbar {
display: none !important;
}
-
+
/* Track */
.hide-scroll::-webkit-scrollbar-track {
display: none !important;
@@ -964,15 +964,15 @@ background: rgb(92, 92, 92);
.date-hour-picker {
margin-top: -6px;
-
+
label#mat-form-field-label-7 {
display: none;
}
-
+
.span.ng-tns-c193-4, .ng-star-inserted {
// display: none;
}
-
+
.ng-star-inserted{
// display: none;
position: absolute;
@@ -988,7 +988,7 @@ background: rgb(92, 92, 92);
width: 100%;
height: 100%;
}
-
+
.mat-datepicker-toggle, mat-datepicker-toggle {
width: 100%;
}
@@ -1027,7 +1027,7 @@ ngx-mat-datetime-content{
.mat-button-disabled {
background-color: #ff5a5a59 !important;
}
- }
+ }
}
@@ -1053,7 +1053,7 @@ ngx-mat-datetime-content{
}
}
-@media only screen and (min-width: 665px) {
+@media only screen and (min-width: 665px) {
.loading-blocker {
.loading-blocker-container {
@@ -1072,7 +1072,7 @@ ngx-mat-datetime-content{
border-bottom: 3px solid transparent !important;
}
}
-
+
.calendar-segment-pr {
.calendar-mdgpr-event-type-Pessoal {
border-top: 3px solid transparent !important;