From 5d7f0d08be0c3dd9228a786cd6d2bbc5f9993903 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 29 Dec 2020 10:15:47 +0100 Subject: [PATCH 01/23] Add custom scss function to conver px to em and rem --- src/function.scss | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 src/function.scss diff --git a/src/function.scss b/src/function.scss new file mode 100644 index 000000000..818b0bb66 --- /dev/null +++ b/src/function.scss @@ -0,0 +1,60 @@ + +// =============== Custom function ============================== + +// convert string number to int or double +@function to-number($value) { + @if type-of($value) == 'number' { + @return $value; + } @else if type-of($value) != 'string' { + @error 'Value for `to-number` should be a number or a string.'; + } + + $result: 0; + $digits: 0; + $minus: str-slice($value, 1, 1) == '-'; + $numbers: ('0': 0, '1': 1, '2': 2, '3': 3, '4': 4, '5': 5, '6': 6, '7': 7, '8': 8, '9': 9); + + @for $i from if($minus, 2, 1) through str-length($value) { + $character: str-slice($value, $i, $i); + + @if (index(map-keys($numbers), $character) or $character == '.') { + @if $character == '.' { + $digits: 1; + } @else if $digits == 0 { + $result: $result * 10 + map-get($numbers, $character); + } @else { + $digits: $digits * 10; + $result: $result + map-get($numbers, $character) / $digits; + } + } + } + + @return if($minus, -$result, $result);; + } + + // convert px to rem + @function rem($size) { + $remSize: to-number($size) / 16; + //Default font size on html is 16px; + @return #{$remSize}rem; + } + + // convert px to em + @function em($size) { + $remSize: to-number($size) / 16px; + @return #{$remSize}em; + } + + // convert pt to rem + @function pt-rem($size) { + $pxSize: to-number($size) * 1.328147; + $remSize: $pxSize / 16; + @return #{$remSize}rem; + } + + // convert pt to em + @function pt-em($size) { + $pxSize: to-number($size) * 1.328147; + $remSize: $pxSize / 16; + @return #{$remSize}em; + } \ No newline at end of file From ea89cb205a35361361f2e1e30eae6ab6ff2ce456 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 29 Dec 2020 10:17:34 +0100 Subject: [PATCH 02/23] Add responsive effect in shared header MD --- src/app/shared/header/header.page.html | 36 ++++++++++------ src/app/shared/header/header.page.scss | 57 ++++++++++++++------------ 2 files changed, 54 insertions(+), 39 deletions(-) diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 49c3e1cac..3e9412eba 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -1,14 +1,26 @@ -
-
- -
- -
- -
-
+ + + + + +
+ +
+ + + + + +
+ +
+ + + + + - + \ No newline at end of file diff --git a/src/app/shared/header/header.page.scss b/src/app/shared/header/header.page.scss index cf8935c63..fdd23808c 100644 --- a/src/app/shared/header/header.page.scss +++ b/src/app/shared/header/header.page.scss @@ -1,28 +1,31 @@ -.div-top-header{ - width: 400px; - margin: 0 auto; - background-color: #0782c9; - overflow: auto; - padding-top: 15px; - border: 0!important; +@import '~src/function.scss'; - .div-search{ - font-size: 45px; - float: left; - margin: 0 0 0 10px - } - .div-logo{ - background: transparent; - width: 140px; - margin: 5px 0 0px 71px; - float: left; - } - .div-logo img{ - width: 100%; - } - .div-profile{ - font-size: 45px; - float: right; - margin-right: 10px; - } - } \ No newline at end of file +.div-top-header{ + margin: 0 auto; + background-color: #0782c9; + overflow: auto; + padding-top: 15px; + border: 0!important; + + .div-search{ + font-size: 45px; + margin: 0 0 0 10px + } + .div-logo{ + background: transparent; + width: em(140px); + margin: 0px auto; + margin-top: 5px; + justify-content: center; + display: flex; + } + .div-logo img{ + width: 100%; + margin: 0px auto; + } + .div-profile{ + font-size: 45px; + float: right; + margin-right: 10px; + } +} \ No newline at end of file From 9591688aa0b1911b69e31044eab0be6617fcc9ef Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 29 Dec 2020 10:19:12 +0100 Subject: [PATCH 03/23] Remove unnecessary imports --- src/app/app.module.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index f721322e2..21fd97ea0 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -13,7 +13,7 @@ import { HttpClientModule } from '@angular/common/http'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; -import { File } from '@ionic-native/File/ngx'; +//import { File } from '@ionic-native/File/ngx'; import { WebView } from '@ionic-native/ionic-webview/ngx'; import { FilePath } from '@ionic-native/file-path/ngx'; import { Camera } from '@ionic-native/camera/ngx'; @@ -35,7 +35,7 @@ import { IonicStorageModule } from '@ionic/storage'; { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, InAppBrowser, Camera, - File, + //File, WebView, FilePath, ], From 969d16915963276225a024838c9deabceccbe929 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 29 Dec 2020 10:27:01 +0100 Subject: [PATCH 04/23] Change px unity to custom scss em fucntion --- src/app/shared/header/header.page.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/header/header.page.scss b/src/app/shared/header/header.page.scss index fdd23808c..59eae0c69 100644 --- a/src/app/shared/header/header.page.scss +++ b/src/app/shared/header/header.page.scss @@ -4,7 +4,7 @@ margin: 0 auto; background-color: #0782c9; overflow: auto; - padding-top: 15px; + padding-top: em(15px); border: 0!important; .div-search{ @@ -26,6 +26,6 @@ .div-profile{ font-size: 45px; float: right; - margin-right: 10px; + margin-right: em(10px); } } \ No newline at end of file From 97be93576859b88f09b18c9f3f8e1da836973710 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 29 Dec 2020 11:09:46 +0100 Subject: [PATCH 05/23] Add shared component header MD in events page --- src/app/pages/events/events.module.ts | 2 + src/app/pages/events/events.page.html | 240 ++------------------------ src/app/pages/events/events.page.scss | 9 +- 3 files changed, 23 insertions(+), 228 deletions(-) diff --git a/src/app/pages/events/events.module.ts b/src/app/pages/events/events.module.ts index ce992f7a5..d88c468df 100644 --- a/src/app/pages/events/events.module.ts +++ b/src/app/pages/events/events.module.ts @@ -7,12 +7,14 @@ import { IonicModule } from '@ionic/angular'; import { EventsPageRoutingModule } from './events-routing.module'; import { EventsPage } from './events.page'; +import { SharedModule } from 'src/app/shared/shared.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, + SharedModule, EventsPageRoutingModule ], declarations: [EventsPage], diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 4592c1116..26b2e750b 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -1,234 +1,20 @@ - -
-
- -
- -
- -
-
- - - - - -
-
- - - -
-
- - - - - - -

{{greetting}} Excelência
- Ministro Director do Gabinete do - Presidente da República -

- - - - - - - - - - Combinada - - - Oficial - - - Pessoal - - - + - + + -

{{customDate}}

+

{{customDate}}

+ + +

5 eventtos agendados para hoje

 - - - -
- - - - - - - -
- - -
-
-

{{event.StartDate | date: 'hh:mm'}}

-

{{event.EndDate | date: 'hh:mm'}}

-
-
-

{{event.Location}}

-

{{event.Subject}}

-
-
- - -
- - - - -
- - -
-
-

{{event.StartDate | date: 'hh:mm'}}

-

{{event.EndDate | date: 'hh:mm'}}

-
-
-

{{event.Location}}

-

{{event.Subject}}

-
-
- - -
- - - - -
- - -
-
-

{{event.StartDate | date: 'hh:mm'}}

-

{{event.EndDate | date: 'hh:mm'}}

-
-
-

{{event.Location}}

-

{{event.Subject}}

-
-
- - -
- -
- +
+
08:30
+
Reunião de Conselho de Ministros no Palácio Presidencial
+
+ + \ No newline at end of file diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index cae4ec29a..07435b4d8 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -266,4 +266,11 @@ ion-toolbar{ bottom: 15px; right: 14px; color: #e16817; - } \ No newline at end of file + } + + +.next-meeting{ + display: flex; + justify-content: center; + margin: 0px auto; +} \ No newline at end of file From d0e13bad141da81323afbcf0c881c37cdead4e5d Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 30 Dec 2020 10:15:09 +0100 Subject: [PATCH 06/23] Add new icons --- .../images/icons-arrow-circle-arrow-right.svg | 12 ++++++ src/assets/images/icons-nav-agenda-active.svg | 32 +++++++++++++++ src/assets/images/icons-nav-agenda-bag.svg | 40 +++++++++++++++++++ 3 files changed, 84 insertions(+) create mode 100644 src/assets/images/icons-arrow-circle-arrow-right.svg create mode 100644 src/assets/images/icons-nav-agenda-active.svg create mode 100644 src/assets/images/icons-nav-agenda-bag.svg diff --git a/src/assets/images/icons-arrow-circle-arrow-right.svg b/src/assets/images/icons-arrow-circle-arrow-right.svg new file mode 100644 index 000000000..9d054aedf --- /dev/null +++ b/src/assets/images/icons-arrow-circle-arrow-right.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/images/icons-nav-agenda-active.svg b/src/assets/images/icons-nav-agenda-active.svg new file mode 100644 index 000000000..0ffb2f94b --- /dev/null +++ b/src/assets/images/icons-nav-agenda-active.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-nav-agenda-bag.svg b/src/assets/images/icons-nav-agenda-bag.svg new file mode 100644 index 000000000..6edb5708b --- /dev/null +++ b/src/assets/images/icons-nav-agenda-bag.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 97f21bbc169d71f31dad411f848fbc827e8019a0 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 30 Dec 2020 11:42:30 +0100 Subject: [PATCH 07/23] Add new icon --- src/assets/images/icons-nav-agenda-bag.svg | 40 ---------------------- 1 file changed, 40 deletions(-) delete mode 100644 src/assets/images/icons-nav-agenda-bag.svg diff --git a/src/assets/images/icons-nav-agenda-bag.svg b/src/assets/images/icons-nav-agenda-bag.svg deleted file mode 100644 index 6edb5708b..000000000 --- a/src/assets/images/icons-nav-agenda-bag.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 29bbb542ca1ca885aa90d6c505fb272ef9a079c6 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 30 Dec 2020 11:43:48 +0100 Subject: [PATCH 08/23] Add responsive effect in home tab --- src/app/home/home.module.ts | 3 ++- src/app/home/home.page.html | 6 ++++-- src/app/home/home.page.scss | 8 ++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index d08ad6d08..51c35d4f1 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -8,7 +8,7 @@ import { HomePageRoutingModule } from './home-routing.module'; import { HomePage } from './home.page'; /* import { IonicSelectableModule } from 'ionic-selectable'; */ - +import { SharedModule } from 'src/app/shared/shared.module'; @NgModule({ imports: [ @@ -16,6 +16,7 @@ import { HomePage } from './home.page'; FormsModule, IonicModule, HomePageRoutingModule, + SharedModule ], declarations: [HomePage] }) diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 269073e67..1c45791b3 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -1,5 +1,7 @@ - - + + + + diff --git a/src/app/home/home.page.scss b/src/app/home/home.page.scss index 9d05f7947..57a1ccc35 100644 --- a/src/app/home/home.page.scss +++ b/src/app/home/home.page.scss @@ -25,4 +25,12 @@ ion-badge {/* */ white-space: nowrap; vertical-align: baseline; */ +} + + +.tab{ + .bottoms{ + display: flex; + justify-content: space-around; + } } \ No newline at end of file From 51804e73a36270c66e73072e8ca8406ae7a73ae0 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 30 Dec 2020 11:44:19 +0100 Subject: [PATCH 09/23] Improve home page --- src/app/pages/events/events.page.html | 123 ++++++++++++++++- src/app/pages/events/events.page.scss | 175 ++++++++++++++++++++++++- src/app/shared/header/header.page.scss | 5 +- 3 files changed, 298 insertions(+), 5 deletions(-) diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 26b2e750b..6ef1bbaeb 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -6,10 +6,10 @@ -

{{customDate}}

+

{{customDate}}

 -

5 eventtos agendados para hoje

+

5 eventos agendados para hoje
@@ -17,4 +17,123 @@
Reunião de Conselho de Ministros no Palácio Presidencial
+
+
+
+
+ +
A sua Agenda
+
+ + +
+
+
    +
  • +
    +
    08:30
    +
    12:30
    +
    +
    +
    Luanda | Palácio Presidencial
    +
    Reunião de Conselho de Ministros
    +
    +
    + +
    +
    • +
  • +
    +
    08:30
    +
    12:30
    +
    +
    +
    Luanda | Palácio Presidencial
    +
    Reunião de Conselho de Ministros
    +
    +
    + +
    +
    • +
  • +
    +
    08:30
    +
    12:30
    +
    +
    +
    Luanda | Palácio Presidencial
    +
    Reunião de Conselho de Ministros
    +
    +
    + +
    +
    • +
  • +
    +
    08:30
    +
    12:30
    +
    +
    +
    Luanda | Palácio Presidencial
    +
    Reunião de Conselho de Ministros
    +
    +
    + +
    +
    • +
+
+
+ Resumo para Amnahã +
+
4 eventos ageandados para amanhã
+
08:30 "Reunião Staff" no Palácio Presidencial
+
+
+
+ +
+
+
+ +
Correspondência por ler
+
+ + +
+
+
    +
  • + +
    +
    Reunião de Conselho de Ministros
    +
    MINEC, MINFIN
    +
    +
    • +
  • + +
    +
    Reunião de Conselho de Ministros
    +
    MINEC, MINFIN
    +
    +
    • +
  • +
    +
    Reunião de Conselho de Ministros
    +
    MINEC, MINFIN
    +
    +
    • +
  • +
    +
    Reunião de Conselho de Ministros
    +
    MINEC, MINFIN
    +
    +
    • +
+
+
+
+ + + \ No newline at end of file diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index 07435b4d8..da03cc79f 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -1,3 +1,5 @@ +@import '~src/function.scss'; + /* HEADER */ .bg-blue{ --background:#0782c9; @@ -269,8 +271,179 @@ ion-toolbar{ } + +// new +.main{ + padding: 0px em(20px); +} + +.event-number{ + color: white; + font-family: Roboto; + font-size: 15px; + color: var(--white); + + bold{ + font-family: Roboto; + font-size: 25px; + text-align: right; + color: var(--white); + } +} +.time{ + font-family: Roboto; + font-size: 30px; + text-align: center; + color: var(--white); + line-height: unset; +} + .next-meeting{ display: flex; justify-content: center; - margin: 0px auto; + margin: 0px 20px; + margin-top: 15px; + + .meeting-time { + font-size: em(25px); + font-family: Roboto; + font-weight: 300; + color: var(--white); + margin-right: 7px; + } + + .meeting-description { + margin-top: 2px; + font-family: Roboto; + font-size: 15px; + color: var(--white); + } +} + +.conteiner-box { + display: flex; + flex-wrap: wrap; + justify-content: center; +} +.schedule { + width: 400px; + font-family: Roboto; + margin: 10px 0px; + padding: 20px; + background-color: white; + box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); + border: solid 1px #e9e9e9; + margin-bottom: 20px; + border-radius: 25px; + .schedule-header{ + display: flex; + margin-bottom: 20px; + justify-content: space-between; + .title { + display: flex; + align-items: center; + .icon{ + color: #e8e8e8; + height: 35px; + width: 35px; + margin-right: 10px; + } + .text{ + font-family: Roboto; + font-size: 20px; + color: black; + } + } + .icon-next { + color: #e8e8e8; + height: 35px; + width: 35px; + font-size: 35px; + font-size: 35px; + } + } + .content{ + ul{ + padding: 0px; + margin: 0px; + li{ + padding-bottom: 5px; + margin-top: 5px; + border-bottom: 1px solid #ebebeb; + display: flex; + justify-content: space-between; + align-items: center; + .schedule-time{ + margin-right: 10px; + .time-start{ + color: #797979 !important; + font-family: Roboto; + font-size: 13px; + } + .time-end{ + color: #797979 !important; + font-family: Roboto; + font-size: 13px; + } + } + .schedule-details{ + display: flex; + flex-wrap: wrap; + align-items: center; + width: 100%; + .location{ + font-family: Roboto; + font-size: 13px; + color: black; + width: 100%; + + } + .description{ + font-family: Roboto; + font-size: 15px; + font-weight: bold; + color: #0d89d1; + } + } + .color{ + width: 5px; + height: 40px; + border-top-right-radius: 5px; + border-bottom-right-radius: 5px; + background-color: #f05d5e; + } + } + li:last-child{ + //border-bottom: unset !important; + //padding-bottom: unset !important; + } + } + + } + + .resume{ + .title{ + font-family: Roboto; + font-size: 15px; + font-weight: 500; + color: #797979; + margin-bottom: 5px; + margin-top: 10px; + } + .event-num, .first-event-time{ + font-family: Roboto; + font-size: 15px; + display: block; + color: black; + } + } + +} + + +@media only screen and (min-width: 804px) { + .schedule:first-child { + margin-right: 2%; + + } } \ No newline at end of file diff --git a/src/app/shared/header/header.page.scss b/src/app/shared/header/header.page.scss index 59eae0c69..d18475831 100644 --- a/src/app/shared/header/header.page.scss +++ b/src/app/shared/header/header.page.scss @@ -25,7 +25,8 @@ } .div-profile{ font-size: 45px; - float: right; - margin-right: em(10px); + margin-right: 10px; + justify-content: flex-end; + display: flex; } } \ No newline at end of file From de028355ef5edfcada73f0dabc06064fcf96bf09 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 4 Jan 2021 09:16:18 +0100 Subject: [PATCH 10/23] Fixe container width with media only screen --- src/app/pages/events/events.page.scss | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index da03cc79f..76a55f66b 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -326,7 +326,7 @@ ion-toolbar{ justify-content: center; } .schedule { - width: 400px; + max-width: 400px; font-family: Roboto; margin: 10px 0px; padding: 20px; @@ -442,8 +442,22 @@ ion-toolbar{ @media only screen and (min-width: 804px) { + .schedule:first-child { margin-right: 2%; } +} + +@media only screen and (min-width: 478px) { + .schedule{ + width: 400px; + } +} + + +@media only screen and (max-width: 478px) { + .schedule{ + width: 360px; + } } \ No newline at end of file From 7742a8af995b9789c41b3c314b009fe433ba9001 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 4 Jan 2021 10:10:49 +0100 Subject: [PATCH 11/23] Add dynamic MD schedule list --- src/app/pages/events/events.page.html | 56 +++++---------------------- src/app/pages/events/events.page.scss | 9 +++++ 2 files changed, 18 insertions(+), 47 deletions(-) diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 6ef1bbaeb..0508c9135 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -29,58 +29,20 @@
    -
  • +
  • +
    -
    08:30
    -
    12:30
    +
    {{event.StartDate | date: 'hh:mm'}}
    +
    {{event.EndDate | date: 'hh:mm'}}
    -
    Luanda | Palácio Presidencial
    -
    Reunião de Conselho de Ministros
    -
    -
    - -
    -
    • -
  • -
    -
    08:30
    -
    12:30
    -
    -
    -
    Luanda | Palácio Presidencial
    -
    Reunião de Conselho de Ministros
    -
    -
    - -
    -
    • -
  • -
    -
    08:30
    -
    12:30
    -
    -
    -
    Luanda | Palácio Presidencial
    -
    Reunião de Conselho de Ministros
    -
    -
    - -
    -
    • -
  • -
    -
    08:30
    -
    12:30
    -
    -
    -
    Luanda | Palácio Presidencial
    -
    Reunião de Conselho de Ministros
    -
    -
    - +
    {{event.Location}}
    +
    {{event.Subject}}
    +
+
diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index 76a55f66b..858fc79a8 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -366,6 +366,12 @@ ion-toolbar{ ul{ padding: 0px; margin: 0px; + .d-flex{ + height: 40px; + display: flex; + justify-content: space-between; + align-items: center; + } li{ padding-bottom: 5px; margin-top: 5px; @@ -440,6 +446,9 @@ ion-toolbar{ } +.d-flex { + display: flex; +} @media only screen and (min-width: 804px) { From bc4c8c47611938246ac85a0d5825a47b58801c24 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 4 Jan 2021 10:37:13 +0100 Subject: [PATCH 12/23] Add event counter in home page --- src/app/pages/events/events.page.html | 4 ++-- src/app/pages/events/events.page.ts | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 0508c9135..77eb130a5 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -9,7 +9,7 @@

{{customDate}}

-

5 eventos agendados para hoje

+

{{totalEvent}} eventos agendados para hoje
@@ -42,7 +42,7 @@
- +
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 70921673c..6954bd26b 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -12,6 +12,7 @@ import { AuthConnstants } from 'src/app/config/auth-constants'; import { ModalController } from '@ionic/angular'; import { EventDetailPage } from './event-detail/event-detail.page'; import { EventDetailModalPage } from './event-detail-modal/event-detail-modal.page'; +import { ProcessesService } from '../../services/processes.service'; @Component({ selector: 'app-events', @@ -46,6 +47,7 @@ export class EventsPage implements OnInit { combinedEvents: Event[]; customText = false; + totalEvent=0; showLoader: boolean; @@ -65,7 +67,21 @@ export class EventsPage implements OnInit { //Initialize profile as mdgpr this.profile = "mdgpr"; console.log(this.profile); - + + // set event list + if(this.profile == "mdgpr"){ + this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { + this.eventsList = res; + this.totalEvent = this.eventsList.length; + }); + } + else{ + this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { + this.eventsList = res; + this.totalEvent = this.eventsList.length; + }); + + } this.showGreeting(); From 1d2b52a0a830218802f0c5a1186f7e61c325c06d Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 4 Jan 2021 11:34:43 +0100 Subject: [PATCH 13/23] Add current hours and minutes on display --- src/app/pages/events/events.page.html | 2 +- src/app/pages/events/events.page.ts | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 77eb130a5..8bd61abe9 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -13,7 +13,7 @@
-
08:30
+
{{hoursMinutes}}
Reunião de Conselho de Ministros no Palácio Presidencial
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 6954bd26b..807d05627 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -48,6 +48,7 @@ export class EventsPage implements OnInit { customText = false; totalEvent=0; + currentHoursMinutes: String; showLoader: boolean; @@ -59,6 +60,15 @@ export class EventsPage implements OnInit { private modalController: ModalController, private authService: AuthService) { this.prEventList = null; + + // update hours and time + setInterval(()=> { + let d = new Date(); + let n = d.toLocaleTimeString(); + this.currentHoursMinutes = n.slice(0,5); + }, 1000); + + } ngOnInit() { @@ -217,5 +227,15 @@ export class EventsPage implements OnInit { return await modal.present(); } + + /** + * @returns time in format HH:MM:SS + */ + get hoursMinutes():String { + + return this.currentHoursMinutes; + + } + } From 75f9dc0165522ace246fe79a855477fae642093a Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 5 Jan 2021 09:24:16 +0100 Subject: [PATCH 14/23] Add dynamic correspondence list and change date formate to 24 hours --- src/app/pages/events/events.page.html | 31 ++++++------------------ src/app/pages/events/events.page.scss | 4 +++ src/app/pages/events/events.page.ts | 35 +++++++++++++++++++++------ 3 files changed, 40 insertions(+), 30 deletions(-) diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 8bd61abe9..242ff2532 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -44,6 +44,7 @@ +
@@ -65,32 +67,15 @@
    -
  • +
  • -
    -
    Reunião de Conselho de Ministros
    -
    MINEC, MINFIN
    -
    -
    • -
  • - -
    -
    Reunião de Conselho de Ministros
    -
    MINEC, MINFIN
    -
    -
    • -
  • -
    -
    Reunião de Conselho de Ministros
    -
    MINEC, MINFIN
    -
    -
    • -
  • -
    -
    Reunião de Conselho de Ministros
    -
    MINEC, MINFIN
    +
    +
    {{ task.Remetente }}
    +
    {{ task.Folio }}
    • +
diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index 858fc79a8..e6ca8de85 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -450,6 +450,10 @@ ion-toolbar{ display: flex; } +.pointer{ + cursor: pointer; +} + @media only screen and (min-width: 804px) { .schedule:first-child { diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 807d05627..39b0cc475 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -13,6 +13,7 @@ import { ModalController } from '@ionic/angular'; import { EventDetailPage } from './event-detail/event-detail.page'; import { EventDetailModalPage } from './event-detail-modal/event-detail-modal.page'; import { ProcessesService } from '../../services/processes.service'; +import { DailyWorkTask } from '../../models/dailyworktask.model'; @Component({ selector: 'app-events', @@ -51,6 +52,8 @@ export class EventsPage implements OnInit { currentHoursMinutes: String; showLoader: boolean; + + taskslist:DailyWorkTask[]; constructor(private eventService: EventsService, private router: Router, @@ -58,16 +61,17 @@ export class EventsPage implements OnInit { public activatedRoute: ActivatedRoute, private alertController: AlertService, private modalController: ModalController, - private authService: AuthService) { + private authService: AuthService, + private processes:ProcessesService) { this.prEventList = null; - - // update hours and time + + // update hours and minutes setInterval(()=> { - let d = new Date(); - let n = d.toLocaleTimeString(); - this.currentHoursMinutes = n.slice(0,5); + this.currentHoursMinutes = formatDate(new Date(), 'HH:MM', 'pt'); }, 1000); + // list + this.LoadList(); } @@ -229,7 +233,7 @@ export class EventsPage implements OnInit { /** - * @returns time in format HH:MM:SS + * @returns time in format HH:MM */ get hoursMinutes():String { @@ -237,5 +241,22 @@ export class EventsPage implements OnInit { } + LoadList() + { + this.processes.GetTasksList("Expediente", false).subscribe(result => { + this.taskslist = new Array(); + result.forEach(element => { + let task: DailyWorkTask = { + "SerialNumber": element.serialNumber, + "Folio": element.workflowInstanceFolio, + "Senders": element.originator.email, + "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), + "DocumentURL": element.formURL, + "Remetente": element.workflowInstanceDataFields.Remetente + } + this.taskslist.push(task); + }); + }); + } } From 2695162e65e8aafea6a0990ec450b6194a225d3e Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 5 Jan 2021 09:55:24 +0100 Subject: [PATCH 15/23] Remove last border bottom --- src/app/pages/events/events.page.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index e6ca8de85..07df9f739 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -367,6 +367,7 @@ ion-toolbar{ padding: 0px; margin: 0px; .d-flex{ + width: 100%; height: 40px; display: flex; justify-content: space-between; @@ -420,8 +421,8 @@ ion-toolbar{ } } li:last-child{ - //border-bottom: unset !important; - //padding-bottom: unset !important; + border-bottom: unset !important; + padding-bottom: unset !important; } } From 8b04836ad44a25c20d934559c00d07268d4ec1c4 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 5 Jan 2021 11:35:02 +0100 Subject: [PATCH 16/23] Add current hour in getEvents method to filter upcoming events only --- src/app/pages/events/events.page.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 39b0cc475..c143f1a2a 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -83,19 +83,20 @@ export class EventsPage implements OnInit { console.log(this.profile); // set event list - if(this.profile == "mdgpr"){ - this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { + /* if(this.profile == "mdgpr"){ + this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { this.eventsList = res; + console.log(this.eventsList); this.totalEvent = this.eventsList.length; }); } else{ - this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { + this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { this.eventsList = res; this.totalEvent = this.eventsList.length; }); - } + } */ this.showGreeting(); @@ -127,7 +128,7 @@ export class EventsPage implements OnInit { { case "Combinada": if(this.profile == "mdgpr"){ - this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { + this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt') /* + ' 00:00:00' */, formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { this.eventsList = res; this.showLoader = false; }); From 40543826b75d9ea7185f8cb6304fbf54cee45b9f Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 5 Jan 2021 11:37:07 +0100 Subject: [PATCH 17/23] Add search result options --- src/app/home/home.page.html | 4 +- src/app/pages/search/search.page.html | 76 +++++++++++++++++++++++++-- src/app/pages/search/search.page.scss | 60 +++++++++++++++------ 3 files changed, 118 insertions(+), 22 deletions(-) diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 1c45791b3..16eebfd41 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -24,10 +24,10 @@ Acções - + + + +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+
+ +
- - - - -
- -
- - - -
- -
- - - -
- -
- - - - - - - -
-

Protocolos

- 10 - -
- - - -
-

Faturas

- 10 -
- - - + +
+
+

Relatório

10
- - - - -
-

Protocolos

- 10 -
- - - -
-

Faturas

- 10 -
- - -

Relatório

10
- - - - - +
+

Relatório

+ 10 +
+
+

Relatório

+ 10 +
+
+

Relatório

+ 10 +
+
+

Relatório

+ 10 +
+
+
+ +
+
+ +
+ +
+ +
+

Palavas mais pesquisdas

+
+ + +
+
+
+
+

Order por:Mais Recente

+
+
+ +
+
+
+
    +
  • +
    + +
    +
    +

    title

    +
    + MINEC, MINFIN + 13/04/2020 +
    +
    +
    • +
  • +
    + +
    +
    +

    title

    +
    + MINEC, MINFIN + 13/04/2020 +
    +
    +
    • +
  • +
    + +
    +
    +

    title

    +
    + MINEC, MINFIN + 13/04/2020 +
    +
    +
    • +
  • +
    + +
    +
    +

    title

    +
    + MINEC, MINFIN + 13/04/2020 +
    +
    +
    • +
  • +
    + +
    +
    +

    title

    +
    + MINEC, MINFIN + 13/04/2020 +
    +
    +
    • +
+
+ +
+ diff --git a/src/app/pages/search/search.page.scss b/src/app/pages/search/search.page.scss index 4226aacc8..df087037b 100644 --- a/src/app/pages/search/search.page.scss +++ b/src/app/pages/search/search.page.scss @@ -1,48 +1,210 @@ -.search-input-container{ +.header-main{ + padding: 5px 18px; + padding-bottom: 2px; + padding-top: 25px; + .search-input-container{ + max-width: 309px; + background-color: white; + border-radius: 27.5px; border: solid 1px #ebebeb; -} -.icon-search{ - font-size: 16px; - -} - -.icon-search-container, .icon-search{ - width: 45px; - height: 45px; -} - -.search-result{ - margin-top: 20px; - padding-bottom: 10px; - border-bottom: 1px solid #ebebeb; - .button{ - border: solid 1px #e9e9e9; - - padding: 5px 20px; - p{ - padding: 0px; - margin: 0px; - font-family: Roboto; - color: #0d89d1; - font-size: 15px; - } - .label{ - font-family: Roboto; - font-size: 13px; - font-weight: 300; + .icon{ color: #797979; + width: 45px; + height: 45px; + display: flex; + justify-content: center; + font-size: 25px; + align-items: center; } - border-radius: 15px; + .icon-z{ + width: 15px; + } + } + .icon-z{ + display: flex; + justify-content: center; + align-items: center; + font-size: 45px; + } + .profile{ + display: none; + font-size: 45px; } - .button:hover{ - background-color: #42b9fe; - color: white; - p{ - color: white; +} + +// search result type +.options{ + margin-top: 10px; + .container{ + display: flex; + .d-flex{ + display: flex; + flex-wrap: wrap; + width: 100%; + flex-wrap: wrap; + .button{ + width: 116px; + border: solid 1px #e9e9e9; + margin: 0px 5px; + margin-bottom: 10px; + padding: 5px 20px; + p{ + padding: 0px; + margin: 0px; + font-family: Roboto; + color: #0d89d1; + font-size: 15px; + } + .label{ + font-family: Roboto; + font-size: 13px; + font-weight: 300; + color: #797979; + } + border-radius: 15px; + } + + .button:hover{ + background-color: #42b9fe; + color: white; + p{ + color: white; + } + .label{ + color: white; + } + } } - .label{ - color: white; + .icon{ + display: none; + width: 45px; + height: 45px; + justify-content: center; + align-items: center; + ion-icon{ + width: 25px; + } } } -} \ No newline at end of file + + +} + + + +.d-flex{ + display: flex; + // search result + .search-result{ + width: 100%; + border-bottom: unset; + padding: 0px 20px; + + .header{ + border-top: 1px solid #ebebeb; + .sort-by{ + width: 100%; + .order{ + font-family: Roboto; + font-size: 13px; + font-weight: 300; + color:#797979 + } + .order-labal{ + font-family: Roboto; + font-size: 15px; + color: #0d89d1; + margin-left: 20px; + } + } + ion-icon{ + font-size: 25px; + } + } + ul{ + padding: 0px; + margin: 0px; + li{ + padding-top: 8px; + padding-bottom: 8px; + border-top: 1px solid #ebebeb; + display: flex; + align-items: center; + .icon{ + font-size: 35px; + align-items: center; + display: flex; + } + .content{ + width: 100%; + margin-left: 10px; + p{ + margin: 0px; + width: 100%; + font-family: Roboto; + font-size: 15px; + color: #0d89d1; + line-height: 1.67; + } + span{ + height: 15px; + font-family: Roboto; + font-size: 13px; + font-weight: 300; + color: #797979; + } + } + } + } + } + // most searched word + .most-searched-words{ + width: 400px; + display: none; + p{ + height: 24px; + font-family: Roboto; + font-size: 20px; + text-align: center; + color: black; + } + } +} + + + + +@media only screen and (min-width: 1024px) { + + .header-main { + background-color: #0782c9; + .profile{ + display: inline-block; + } + .icon-most-searched-word-open{ + display: none !important; + } + } + + .options{ + .container{ + border-bottom: 1px solid #ebebeb; + .icon{ + display: flex; + } + } + padding: 0px 20px; + } + + + .most-searched-words{ + display: inline-block !important; + } + .search-result{ + border-left: 1px solid #d8d8d8; + .header{ + border-top: unset !important; + } + } +} diff --git a/src/assets/images/icons-arrow-arrow-down-25.svg b/src/assets/images/icons-arrow-arrow-down-25.svg new file mode 100644 index 000000000..9601cfc73 --- /dev/null +++ b/src/assets/images/icons-arrow-arrow-down-25.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/assets/images/icons-most-searched-words-open.svg b/src/assets/images/icons-most-searched-words-open.svg new file mode 100644 index 000000000..cd0fa9c46 --- /dev/null +++ b/src/assets/images/icons-most-searched-words-open.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-search-close.svg b/src/assets/images/icons-search-close.svg new file mode 100644 index 000000000..11669d50a --- /dev/null +++ b/src/assets/images/icons-search-close.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/icons-search-document.svg b/src/assets/images/icons-search-document.svg new file mode 100644 index 000000000..50e282eb5 --- /dev/null +++ b/src/assets/images/icons-search-document.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + From 6b70982166446e8f362ce042744d218479646105 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 7 Jan 2021 10:54:11 +0100 Subject: [PATCH 21/23] save --- src/app/shared/header/header.page.html | 2 +- src/app/shared/header/header.page.ts | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 3e9412eba..bb8995fb1 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -4,7 +4,7 @@ -
+
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index f0f551bca..2476cf83b 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -1,4 +1,6 @@ import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; +import { SearchPage } from 'src/app/pages/search/search.page'; @Component({ selector: 'app-header', @@ -7,9 +9,19 @@ import { Component, OnInit } from '@angular/core'; }) export class HeaderPage implements OnInit { - constructor() { } + constructor(private modalController: ModalController) { } ngOnInit() { } + async openSearch() { + const modal = await this.modalController.create({ + component: SearchPage, + cssClass: 'search', + componentProps: { + } + }); + return await modal.present(); + } + } From 455c4104cd2d61651c660eb2cf7a87ef6c4d3f6c Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 7 Jan 2021 10:57:42 +0100 Subject: [PATCH 22/23] Open modal from header --- src/app/pages/search/search.page.html | 2 +- src/app/pages/search/search.page.ts | 6 +++++- src/app/shared/header/header.page.ts | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index c47ea5e6c..b013b4a52 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -14,7 +14,7 @@
-
+
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 65200fe39..a20587ad8 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { ModalController } from '@ionic/angular'; @Component({ selector: 'app-search', @@ -7,9 +8,12 @@ import { Component, OnInit } from '@angular/core'; }) export class SearchPage implements OnInit { - constructor() { } + constructor(private modalController: ModalController) { } ngOnInit() { } + close(){ + this.modalController.dismiss(); + } } diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 2476cf83b..a983f75e9 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -24,4 +24,6 @@ export class HeaderPage implements OnInit { return await modal.present(); } + + } From 8cd7c4cc82a513ce5a37a36517f9920cb11078d2 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 7 Jan 2021 11:02:35 +0100 Subject: [PATCH 23/23] save --- src/app/pages/search/search.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index b013b4a52..c47ea5e6c 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -14,7 +14,7 @@
-
+