diff --git a/capacitor.config.json b/capacitor.config.json index 4a2bb66dd..abe9bdb63 100644 --- a/capacitor.config.json +++ b/capacitor.config.json @@ -3,6 +3,7 @@ "appName": "gabinete-digital", "webDir": "www", "npmClient": "npm", + "linuxAndroidStudioPath": "/snap/android-studio/current/android-studio/bin/studio.sh", "cordova": { "preferences": { "ScrollEnabled": "false", diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 2e7faa322..5cb9cdebe 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -8,7 +8,7 @@
-
+
@@ -84,7 +84,7 @@
-
+
@@ -150,7 +150,7 @@
-
+
@@ -217,13 +217,17 @@
+
+ +
+ + - + - - + + Hoje,   {{ timelineDate }} diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 2d965a5e9..ff8f853c4 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -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; } \ No newline at end of file diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 162e83afe..45ba02cb8 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -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; diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 7932e8caa..ea64b937a 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -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; diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 949b06931..af6c79654 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -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() { diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index f0cf32a7c..3d8d77d8f 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -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 + + diff --git a/src/assets/images/icons-collaps-down.svg b/src/assets/images/icons-collaps-down.svg new file mode 100644 index 000000000..9fa24a513 --- /dev/null +++ b/src/assets/images/icons-collaps-down.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/icons-collaps-up.svg b/src/assets/images/icons-collaps-up.svg new file mode 100644 index 000000000..7e1e991a4 --- /dev/null +++ b/src/assets/images/icons-collaps-up.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/icons-collaps.svg b/src/assets/images/icons-collaps.svg new file mode 100644 index 000000000..b2cb8818b --- /dev/null +++ b/src/assets/images/icons-collaps.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/global.scss b/src/global.scss index 47114b419..be10a3485 100644 --- a/src/global.scss +++ b/src/global.scss @@ -257,4 +257,16 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- /* .cal-week-view mwl-calendar-week-view-hour-segment, .cal-week-view .cal-hour-segment { display: block; height: 60px !important; -} */ \ No newline at end of file +} */ + +.calendar-container{ + height: 333px; + z-index: 10; + transition: 0.5s; + overflow-y: hidden; + .monthview-container{ + overflow-y: hidden; + height: unset !important; + } + } + \ No newline at end of file