peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-21 13:55:51 +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-05-12 16:43:22 +01:00
parent 3fda3a87d7 b093a47e67
commit 8e22923643
3 changed files with 74 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+2 -2
View File
@@ -149,7 +149,7 @@
</ion-row> </ion-row>
</ion-row> </ion-row>
<div class="pb-5 d-none d-md-flex"> <div class="pb-5 d-none d-md-flex" *ngIf="loggeduser.Profile == 'MDGPR'">
<div class="flex-grow-1 text-grey d-flex justify-center align-center"> <div class="flex-grow-1 text-grey d-flex justify-center align-center">
<div>Própria</div> <div>Própria</div>
</div> </div>
@@ -185,7 +185,7 @@
</mwl-calendar-day-view> </mwl-calendar-day-view>
</div> </div>
<div [ngSwitch]="view" class="fs-timeline flex-grow-1 d-none d-md-block" > <div [ngSwitch]="view" class="fs-timeline flex-grow-1 d-none d-md-block" *ngIf="loggeduser.Profile == 'MDGPR'">
<mwl-calendar-day-view <mwl-calendar-day-view
*ngSwitchCase="'day'" *ngSwitchCase="'day'"
[viewDate]="viewDate" [viewDate]="viewDate"
src/app/pages/agenda/agenda.page.ts
+7 -4
View File
@@ -538,7 +538,7 @@ export class AgendaPage implements OnInit {
//this.eventSource=[]; //this.eventSource=[];
if(this.profile == "mdgpr") { if(this.loggeduser.Profile == 'MDGPR' ) {
this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe( this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe(
response => { response => {
@@ -627,7 +627,7 @@ export class AgendaPage implements OnInit {
case "Pessoal": case "Pessoal":
//Inicializa o array eventSource //Inicializa o array eventSource
if(this.profile == "mdgpr") { if(this.loggeduser.Profile == 'MDGPR') {
this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(response => { this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(response => {
this.eventSource=[]; this.eventSource=[];
@@ -703,7 +703,7 @@ export class AgendaPage implements OnInit {
//Inicializa o array eventSource //Inicializa o array eventSource
this.eventsListOficial = []; this.eventsListOficial = [];
if(this.profile == "mdgpr") { if(this.loggeduser.Profile == 'MDGPR') {
this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(res => { this.eventService.getAllMdEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(res => {
this.eventSource=[]; this.eventSource=[];
this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial"); this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial");
@@ -779,6 +779,7 @@ export class AgendaPage implements OnInit {
// calendar // calendar
let counter = 0; let counter = 0;
if(this.loggeduser.Profile == 'MDGPR') {
this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe( this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe(
response => { response => {
@@ -828,6 +829,8 @@ export class AgendaPage implements OnInit {
} }
}); });
}
this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe( this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(
response => { response => {
@@ -869,7 +872,7 @@ export class AgendaPage implements OnInit {
counter++; counter++;
if(counter==2){ if(counter==2 || this.loggeduser.Profile == 'PR') {
this.showLoader = false; this.showLoader = false;
this.timelineBoxCorrectHeight(500); this.timelineBoxCorrectHeight(500);
this.centralizeTimeline(500); this.centralizeTimeline(500);
src/global.scss
+5 -6
View File
@@ -382,6 +382,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
right: 0px; right: 0px;
height: 100%; height: 100%;
width: 400px; width: 400px;
}
} }
} }
@@ -528,8 +529,8 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
// timeline .timeline-container {
.sd-timeline{ div:nth-child(3) {
.cal-time{ .cal-time{
display: none; display: none;
} }
@@ -542,11 +543,9 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
position: relative; position: relative;
width: 113%; width: 113%;
} }
}
} }
.timeline{ .timeline{
div.cal-event:focus{ div.cal-event:focus{
outline: none !important; outline: none !important;
@@ -677,7 +676,7 @@ ion-content {
top: calc(100% - 160px) !important; top: calc(100% - 160px) !important;
max-height: 160px; max-height: 160px;
min-height: 160px; min-height: 160px;
} }
.monthview-secondary-with-event, .text-muted { .monthview-secondary-with-event, .text-muted {