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 remote-tracking branch 'origin/feature/calendar' into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-02-10 16:16:42 +01:00
parent ad4eb2f0ff f1ebc52479
commit c338e2c440
12 changed files with 65 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+11 -7
View File
@@ -8,7 +8,7 @@
<div>
<!-- Calendar is here -->
<div [ngSwitch]="segment">
<div *ngSwitchCase="'Combinada'">
<div class="calendar-container" *ngSwitchCase="'Combinada'" [style.height]="calendarHeight">
<ion-row class="ion-justify-content-between calendar-tool-tip">
<ion-row class="ion-align-items-center">
@@ -84,7 +84,7 @@
</div>
</ng-template>
</div>
<div *ngSwitchCase="'Pessoal'">
<div class="calendar-container" *ngSwitchCase="'Pessoal'">
<ion-row>
<!-- Move back one screen of the slides -->
<ion-col size="2">
@@ -150,7 +150,7 @@
</ng-template>
</div>
<div *ngSwitchCase="'Oficial'">
<div class="calendar-container" *ngSwitchCase="'Oficial'">
<ion-row>
<!-- Move back one screen of the slides -->
<ion-col size="2">
@@ -217,13 +217,17 @@
</div>
</div>
<div class="calendar-border">
</div>
<!-- Calendar currente date -->
<ion-row class="ion-justify-content-between ion-align-items-center currente-date-timelien">
<ion-row class="timeline-header ion-justify-content-between ion-align-items-center currente-date-timelien">
<ion-row class="timeline-date align-center">
<!-- <ion-icon *ngIf="showCalendar" (click)="showCalendar=false" class="collaps" src="assets/images/icons-add-new-event.svg" >1</ion-icon>
<ion-icon *ngIf="!showCalendar" (click)="showCalendar=true" class="collaps" src="assets/images/icons-add-new-event.svg" >2</ion-icon> -->
<ion-icon *ngIf="showCalendar" (click)="calendarHeight='75px';showCalendar=false" class="collaps" src="assets/images/icons-collaps-up.svg" ></ion-icon>
<ion-icon *ngIf="!showCalendar" (click)="calendarHeight='347px';showCalendar=true" class="collaps" src="assets/images/icons-collaps-down.svg" ></ion-icon>
<span *ngIf="timelineIsCurrentDate()">Hoje, &nbsp;</span> {{ timelineDate }}
</ion-row>
<ion-row class="filter ion-align-items-center">
src/app/pages/agenda/agenda.page.scss
+20 -1
View File
@@ -416,7 +416,7 @@ td.monthview-primary-with-event {
font-weight: bold;
}
.collaps{
font-size: 28px;
font-size: 26px;
padding-right: 8px;
}
.filter{
@@ -460,4 +460,23 @@ td.monthview-primary-with-event {
.showcalendar{
display: none;
}
.timeline-header{
z-index: 1000000;
position: absolute;
width: 100%;
background-color: white;
}
.timeline-container{
margin-top: 67px;
}
.calendar-border{
background: #ebebeb;
margin: 13px 20px;
height: 2px;
}
src/app/pages/agenda/agenda.page.ts
+2 -10
View File
@@ -53,6 +53,7 @@ export class AgendaPage implements OnInit {
// calendar
showCalendar: boolean;
calendarHeight: string;
// timeline
monthList = [
@@ -122,19 +123,10 @@ export class AgendaPage implements OnInit {
private alertCrontroller: AlertService
) {
this.calendarHeight = "347px";
this.showCalendar = true;
this.timelineDate = momentG(new Date(),'dd MMMM yyyy');
function setCookie(cname, cvalue, exdays) {
var d = new Date();
d.setTime(d.getTime() + (exdays*24*60*60*1000));
var expires = "expires="+ d.toUTCString();
document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
}
// AccoesPresidenciais = Correspondencia = 0
setCookie('searchModalAPPType','0', 99999999);
this.showLoader = false;
this.showTimelineFilterState = false;
this.showTimeline = false;
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+1 -9
View File
@@ -22,15 +22,7 @@ export class GabineteDigitalPage implements OnInit {
private modalController: ModalController,
private eventService: EventsService,
private alertService: AlertService) {
function setCookie(cname, cvalue, exdays) {
var d = new Date();
d.setTime(d.getTime() + (exdays*24*60*60*1000));
var expires = "expires="+ d.toUTCString();
document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
}
// AccoesPresidenciais = Correspondencia = 8
setCookie('searchModalAPPType','8,361', 99999999);
}
count_exp_dailywork=0;
src/app/pages/publications/publications.page.ts
-9
View File
@@ -41,15 +41,6 @@ export class PublicationsPage implements OnInit {
this.months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
this.days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
function setCookie(cname, cvalue, exdays) {
var d = new Date();
d.setTime(d.getTime() + (exdays*24*60*60*1000));
var expires = "expires="+ d.toUTCString();
document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
}
// AccoesPresidenciais = AccoesPresidenciais = 386,,
setCookie('searchModalAPPType','386', 99999999);
}
ngOnInit() {
src/app/pages/search/search.page.ts
+4 -21
View File
@@ -120,25 +120,8 @@ export class SearchPage implements OnInit {
*/
basicSearch(){
function getCookie(cname) {
var name = cname + "=";
var decodedCookie = decodeURIComponent(document.cookie);
var ca = decodedCookie.split(';');
for(var i = 0; i <ca.length; i++) {
var c = ca[i];
while (c.charAt(0) == ' ') {
c = c.substring(1);
}
if (c.indexOf(name) == 0) {
return c.substring(name.length, c.length);
}
}
return "";
}
const APPType = getCookie('searchModalAPPType');
if(APPType == '0'){
if(window.location.pathname == '/home/agenda'){
console.log('aplication type 0');
@@ -168,7 +151,7 @@ export class SearchPage implements OnInit {
this.showLoader = false;
});
} else if (APPType == '8,361'){
} else if (window.location.pathname =='/home/gabinete-digital'){
console.log('aplication type 8,361');
@@ -222,7 +205,7 @@ export class SearchPage implements OnInit {
this.showLoader = false;
});
} else if (APPType == '386'){
} else if (window.location.pathname == '/home/publications'){
this.showLoader = true;