+
+
+

{{customDate}}

+
+
+ +

Tarefas que terminam hoje

+ 0
-
-
{{event.Location}}
-
-

{{event.Subject}}

+ +
+ +

Tarefas em atraso

+ 0 +
+ +
+ +

Novas tarefas

+ 0 +
+ +
+ +

Tarefas não lidas

+ 0 +
+
+
+ +
+
+ +
+ +
+
+ +
A sua Agenda
+
+ +
+
+ + + +
+ +
+
{{event.StartDate | date: 'HH:mm'}}
+
{{event.EndDate | date: 'HH:mm'}}
+ +
Todo
+
o dia
+
+
+
+
{{event.Location}}
+
+

{{event.Subject}}

+
+
+
+ + + + +
+
+ +
+
+
+ +
+
+ +
Correspondência por ler
+
+ +
+
+ + +
+
+
{{task.TaskStartDate | date: 'dd-MM-yy'}}
+
{{task.TaskStartDate | date: 'HH:mm'}}
+
+
+
{{ task.Subject }}
+
{{ task.Senders }}
+
+
+ + +
- - - - +
+
+
-
- -
-
- -
Correspondência por ler
-
- -
-
- - -
-
-
{{task.TaskStartDate | date: 'dd-MM-yy'}}
-
{{task.TaskStartDate | date: 'HH:mm'}}
-
-
-
{{ task.Subject }}
-
{{ task.Senders }}
-
+
+
+ +
+
+ +
A sua Agenda
- - - + +
+
+ + + +
+ +
+
{{event.StartDate | date: 'HH:mm'}}
+
{{event.EndDate | date: 'HH:mm'}}
+ +
Todo
+
o dia
+
+
+
+
{{event.Location}}
+
+

{{event.Subject}}

+
+
+
+ + + + +
+
+ +
+ +
+
+ +
Correspondência por ler
+
+ +
+
+ + +
+
+
{{task.TaskStartDate | date: 'dd-MM-yy'}}
+
{{task.TaskStartDate | date: 'HH:mm'}}
+
+
+
{{ task.Subject }}
+
{{ task.Senders }}
+
+
+ + + +
+ diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index 1ab148482..6cd61d272 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -308,11 +308,12 @@ ion-toolbar{ } .time{ font-family: Roboto; - font-size: 30px; + font-size: 18pt; text-align: center; color: var(--header-tab-text-white); line-height: unset; margin-top: 10px; + width: 100%; } .next-meeting{ @@ -519,6 +520,13 @@ ion-toolbar{ max-height: unset !important; } + .schedule-1 { + display: none; + } + .conteiner-box-mobile { + display: flex !important; + } + } @@ -546,3 +554,66 @@ ion-title{ border: 1px solid red; text-overflow: ellipsis; } + + +.box-container { + background-color: white; +} + +.box-container { + padding: 20px; + border-radius: 20px; + + .wrap { + flex-wrap: wrap; + justify-content: center; + } + .event-box { + background-color: #ffb81c2b; + width: 150px; + height: 73px; + margin:5px; + flex-direction: column; + display: flex; + justify-content: space-between; + border-radius: 10px; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + -ms-border-radius: 10px; + -o-border-radius: 10px; + padding: 10px; + p{ + font-size: 14px; + margin-bottom: 5px; + line-height: 15px; + } + span { + font-size: 15px; + font-weight: 600; + } + } +} + +.flex-wrap { + flex-wrap: wrap; +} + +.main-content { + flex-direction: column; +} + + + +.schedule-container { + .schedule { + box-shadow: unset !important; + border: unset !important; + width: unset !important; + max-width: unset !important; + } +} + + +.conteiner-box-mobile { + display: none; +} \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index c9b470f38..819e957b2 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -165,9 +165,12 @@

Despachos criados por mim
- {{ despachoprstore.newList.length}} Despacho s {{ environment.despachoLabel }} novo s

+ {{ despachoprstore.newList.length}} Despachos {{ environment.despachoLabel }} novos + {{ despachoprstore.newList.length}} Despacho {{ environment.despachoLabel }} novo +

{{ despachoprstore.count }} - Documentos

+ Documentos +

@@ -256,8 +259,8 @@

Diplomas por elaborar
- {{ deplomasStore.diplomasGerarListNewCount.length}} Diplomas por elaborar novos - {{ deplomasStore.diplomasGerarListNewCount.length}} Diploma por elaborar novo + {{ deplomasStore.diplomasGerarListNewCount.length}} Diplomas por elaborar novos + {{ deplomasStore.diplomasGerarListNewCount.length}} Diploma por elaborar novo

{{ deplomasStore.DiplomaGerarList.length }} Documentos

diff --git a/src/global.scss b/src/global.scss index fe33adb38..76641119e 100644 --- a/src/global.scss +++ b/src/global.scss @@ -687,6 +687,12 @@ app-despacho-pr ion-content .main-content{ margin: 0px auto !important; } + +app-events .main-content{ + max-width: 1316px !important; + margin: 0px auto !important; +} + app-diplomas-gerar ion-content .main-content{ max-width: 1366px !important; margin: 0px auto !important; diff --git a/version/git-version.ts b/version/git-version.ts index 35634821c..2291d8278 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "332bdded2", - "SHA": "332bdded24b6461a134807f7d5ae2e7ec11834bb", + "shortSHA": "c8adef0ee", + "SHA": "c8adef0eeee9665c4543117e2049a335a762286b", "branch": "feature/gabineteLabels", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Apr 14 08:12:53 2023 +0100'", - "lastCommitMessage": "fix gabinete", - "lastCommitNumber": "4902", + "lastCommitTime": "'Fri Apr 14 08:18:10 2023 +0100'", + "lastCommitMessage": "commit", + "lastCommitNumber": "4903", "change": "", - "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.module.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.scss\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.module.ts", + "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/global.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file