diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index 5df27b85f..bd36576bc 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -1,194 +1,198 @@ - + - -
- -
- -
-
-
- + +
+
+
+
+ +
-
- +
+ +
+ +
+
+
+ +
+
+ +
+
+ + + Campo obrigatório + + +
+ +
+
+
+ +
+
+ + Oficial + Pessoal + +
+
+
+ +
+
+
+ +
+
+ + + +
- - - Campo obrigatório - -
- -
-
-
- -
-
- - Oficial - Pessoal - +
+
+
+ +
+
+ + + +
-
-
-
-
- -
-
- - - -
-
-
- -
-
-
- -
-
- - - -
-
-
- -
-
-
- -
-
- - Não se repete - Repete - - -
-
-
- -
-
-
- -
-
-
- - - Adicionar intervenientes - {{participant.Name}} - - -
-
- +
+
+
+ +
+
+ + Não se repete + Repete + + +
-
-
-
-
-
- -
-
-
- - - Com conhecimento - {{participant.Name}} - - -
-
- +
+
+
+ +
+
+
+ + + Adicionar intervenientes + {{participant.Name}} + + +
+
+ +
+
-
-
-
-
-
- +
+
+
+ +
+
+
+ + + Com conhecimento + {{participant.Name}} + + +
+
+ +
+
+
-
- + +
+
+
+ +
+
+ +
+
+
+ + + +
+ + Documentos Anexados + + + + +

{{attachment.Description}}

+

{{attachment.Stakeholders}} {{ attachment.CreateDate | date: 'dd/MM/yyyy' }}

+ + + +
+
+
-
- - - -
- - Documentos Anexados - - - - -

{{attachment.Description}}

-

{{attachment.Stakeholders}} {{ attachment.CreateDate | date: 'dd/MM/yyyy' }}

- - - -
- - - -

- Cancelar -

-

- Gravar -

- - +
+ + +
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss index 213236ce7..5dd6dbf71 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss @@ -1,111 +1,106 @@ -.header-content{ - width: 360px; - overflow: auto; - margin: 25px auto; -} -.header-title{ - width: 264px; - font-family: Roboto; - font-size: 25px; - margin: 0 5px 0 5px; - padding: 0; - color:#000; - float: left; -} -ion-content{ - --padding-top: 0px; - --padding-start: 15px; - --padding-end: 20px; -} - -.ion-item-container{ - width: 360px; - margin: 15px auto; - border: 1px solid #ebebeb; - border-radius: 5px; - padding-left: 10px; -} -.ion-item-container-no-border{ - width: 100%; - margin: 0px auto; - padding: 0 !important; - overflow: auto; -} -.container-div{ - margin-bottom: 15px; - overflow: auto; -} -.ion-item-class-2{ - width: 360px; - margin: 0px auto; -} -.ion-icon-class{ - width: 45px; - height: 45px; - float: left; - padding: 10px; - font-size: 25px; -} -ion-select{ - padding-left: 5px; - margin-left: 0; -} -.ion-input-class{ - width: 315px; - height: 45px; - border: 1px solid #ebebeb; - border-radius: 5px; - padding-left: 5px; - padding-right: 10px; - float: left; -} -.ion-input-class-no-height{ - border: 1px solid #ebebeb; - border-radius: 5px; - overflow: auto; -} -.list-people{ - width: 256px; +.content{ + padding: 30px 20px 0 20px !important; + margin: 0; float: left; -} -.add-people{ - width: 45px; + .header-content{ + overflow: auto; + } + .header-title{ + font-family: Roboto; + font-size: 25px; + padding: 0; + color:#000; + float: left; + } + + .ion-item-container{ + margin: 15px auto; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 10px; + + } + .ion-item-container-no-border{ + margin: 0px auto; + padding: 0 !important; + overflow: auto; + } + .container-div{ + margin-bottom: 15px; + overflow: hidden; + } + .ion-item-class-2{ + margin: 0px auto; + } + .ion-icon-class{ + width: 45px; + height: 45px; + float: left; + padding: 10px; + font-size: 25px; + } + ion-select{ + padding-left: 5px; + margin-left: 0; + } + .ion-input-class{ + width: calc(100% - 45px); + height: 45px; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 5px; + padding-right: 10px; + float: left; + } + .ion-input-class-no-height{ + border: 1px solid #ebebeb; + border-radius: 5px; + overflow: auto; + } + .list-people{ + width: 256px; + float: left; + + } + .add-people{ + width: 45px; + float: right; + overflow: auto; + font-size: 25px; + padding: 10px; + } + .list-people-title{ + /* font-size: 13px; */ + color: #797979; + } + .attach-document{ + font-size: 15px; + color: #0d89d1; + margin: 5px 5px 5px 10px; + padding: 5px; + float: left; + } + .attach-icon{ + width: 37px; + font-size: 35px; + float: left; + } + .attach-title-item{ + width: 100%; + font-size: 15px; + color:#0d89d1; + } + /* SPAN */ + .span-left{ + float: left; + font-size: 15x; + } + .span-right{ + text-align: right; float: right; - overflow: auto; - font-size: 25px; - padding: 10px; -} -.list-people-title{ - /* font-size: 13px; */ - color: #797979; -} -.attach-document{ - font-size: 15px; - color: #0d89d1; - margin: 5px 5px 5px 10px; - padding: 5px; - float: left; -} -.attach-icon{ - width: 37px; - font-size: 35px; - float: left; -} -.attach-title-item{ - width: 100%; - font-size: 15px; - color:#0d89d1; -} -/* SPAN */ -.span-left{ - float: left; - font-size: 15x; -} -.span-right{ -text-align: right; -float: right; -font-size: 13px; + font-size: 13px; + } } .container-footer{ margin:0 auto; @@ -145,4 +140,10 @@ font-size: 13px; } .span-color{ color:red; +} +.buttons{ + display: flex; + justify-content: space-between; + padding: 20px; + overflow: auto; } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 9a5c970e9..3d2368030 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -1,127 +1,126 @@ - - - {{modalTitle[taskType]}} - -
- -
+ +
+
+ + {{modalTitle[taskType]}} + +
+ +
-
-
-
- -
-
- -
-
-
- -
-
-
- -
-
- - Normal - Urgente - Muito Urgente - Urgentíssimo - -
-
-
-
-
-
- -
-
- - {{type.Description}} - -
-
-
- -
-
-
- -
-
-
- - - Adicionar intervenientes - {{participant.Name}} - - -
-
- +
+
+
+ +
+
+ +
-
-
-
-
-
- -
-
-
- - - Com conhecimento - {{participant.Name}} - - -
-
- +
+
+
+ +
+
+ + Normal + Urgente + Muito Urgente + Urgentíssimo + +
+
+
+
+ +
+
+ + {{type.Description}} + +
+
+
+ +
+
+
+ +
+
+
+ + + Adicionar intervenientes + {{participant.Name}} + + +
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+ + + Com conhecimento + {{participant.Name}} + + +
+
+ +
+
+
+
+ + + +
+ + Documentos Anexados + + + + +

{{attachment.Description}}

+

{{attachment.Stakeholders}} {{ attachment.CreateDate | date: 'dd/MM/yyyy' }}

+ + + +
+
+
- - - -
- - Documentos Anexados - - - - -

{{attachment.Description}}

-

{{attachment.Stakeholders}} {{ attachment.CreateDate | date: 'dd/MM/yyyy' }}

- - - -
- - - -

- Cancelar -

-

- Gravar -

- - +
+ + +
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss index 4fb4b7370..024b06845 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss @@ -1,111 +1,112 @@ -ion-content{ - --padding-top: 20px; - --padding-start: 15px; - --padding-end: 20px; -} -.title{ - font-family: Roboto; - font-size: 25px; - font-weight: normal; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: #000000; - margin: 8px 0 8px 0px; -} -.container-div{ - margin-bottom: 15px; - overflow: auto; -} -.ion-item-container{ - width: 360px; - margin: 15px auto; - border: 1px solid #ebebeb; - border-radius: 5px; - padding-left: 5px; -} -.ion-item-container-no-border{ - width: 360px; - margin: 15px auto; -} -.ion-item-class-2{ - width: 360px; - margin: 0px auto; -} -.ion-icon-class{ - width: 45px; - height: 45px; - float: left; - padding: 10px; - font-size: 25px; -} -ion-select{ - padding-left: 5px; - margin-left: 0; -} -.ion-input-class{ - width: 315px; - height: 45px; - border: 1px solid #ebebeb; - border-radius: 5px; - padding-left: 5px; - padding-right: 10px; - float: left; -} -.ion-input-class-no-height{ - border: 1px solid #ebebeb; - border-radius: 5px; - overflow: auto; -} -.list-people{ - width: 256px; +.content{ + padding: 30px 20px 0 20px !important; + margin: 0; float: left; -} -.add-people{ - width: 45px; + .title{ + font-family: Roboto; + font-size: 25px; + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #000000; + //margin: 8px 0 8px 0px; + } + .container-div{ + margin-bottom: 15px; + overflow: auto; + } + .ion-item-container{ + //width: 360px; + margin: 15px auto; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 5px; + } + .ion-item-container-no-border{ + //width: 360px; + //margin: 15px auto; + } + .ion-item-class-2{ + //width: 360px; + margin: 0px auto; + overflow: auto; + } + .ion-icon-class{ + width: 45px; + height: 45px; + float: left; + padding: 10px; + font-size: 25px; + } + ion-select{ + padding-left: 5px; + margin-left: 0; + } + .ion-input-class{ + width: calc(100% - 45px); + height: 45px; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 5px; + padding-right: 10px; + float: left; + } + .ion-input-class-no-height{ + border: 1px solid #ebebeb; + border-radius: 5px; + overflow: auto; + } + .list-people{ + width: 256px; + float: left; + + } + .add-people{ + width: 45px; + float: right; + overflow: auto; + font-size: 25px; + padding: 10px; + } + .list-people-title{ + /* font-size: 13px; */ + color: #797979; + } + .attach-document{ + font-size: 15px; + color: #0d89d1; + } + + .attach-title-item{ + width: 100%; + font-size: 15px; + color:#0d89d1; + } + /* SPAN */ + .span-left{ + float: left; + font-size: 15x; + } + .span-right{ + text-align: right; float: right; - overflow: auto; - font-size: 25px; - padding: 10px; -} -.list-people-title{ - /* font-size: 13px; */ - color: #797979; -} -.attach-document{ - font-size: 15px; - color: #0d89d1; -} - -.attach-title-item{ - width: 100%; - font-size: 15px; - color:#0d89d1; -} -/* SPAN */ -.span-left{ - float: left; - font-size: 15x; -} -.span-right{ -text-align: right; -float: right; -font-size: 13px; + font-size: 13px; + } } .container-footer{ - margin:0 auto; - overflow: auto; -} -.button-cancel { - width: 170px; - height: 44px; - border-radius: 22.5px; - --background: #e0e9ee; - --color: #061b52; - margin:10px; - } + margin:0 auto; + overflow: auto; + .button-cancel { + width: 170px; + height: 44px; + border-radius: 22.5px; + --background: #e0e9ee; + --color: #061b52; + margin:10px; + } .button-save { width: 170px; height: 44px; @@ -113,4 +114,11 @@ font-size: 13px; --background: #42b9fe; --color:#ffffff; margin:10px; - } \ No newline at end of file + } +} +.buttons{ + display: flex; + justify-content: space-between; + padding: 20px; + overflow: auto; +} \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index c854e5c77..9aeeea0a2 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -56,7 +56,7 @@
-
+
@@ -147,17 +147,17 @@
- - + +
- - - + + +
- - + +
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 63156b633..c84522e9f 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -116,14 +116,19 @@ export class ExpedienteDetailPage implements OnInit { } async openExpedientActionsModal(taskAction: any, task: any) { + let classs; + if( window.innerWidth <= 800){ + classs = 'modal' + } else { + classs = 'modal modal-desktop showAsideOptions' + } const modal = await this.modalController.create({ component: ExpedientTaskModalPage, componentProps: { taskAction: taskAction, task: task, }, - cssClass: 'expedient-task-modal modal-desktop', - backdropDismiss: false + cssClass: classs, }); await modal.present(); modal.onDidDismiss(); @@ -137,12 +142,18 @@ export class ExpedienteDetailPage implements OnInit { } async openBookMeetingModal(task: any) { + let classs; + if( window.innerWidth <= 800){ + classs = 'book-meeting-modal' + } else { + classs = 'modal modal-desktop showAsideOptions' + } const modal = await this.modalController.create({ component: BookMeetingModalPage, componentProps: { task: task, }, - cssClass: 'book-meeting-modal modal-desktop', + cssClass: classs, backdropDismiss: false }); await modal.present(); diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index edcf0b404..b6f9aaf98 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -78,7 +78,7 @@ export class ExpedientsPage implements OnInit { if( window.innerWidth <= 800){ classs = 'modal' } else { - classs = 'gabinete-digital-mobile-modal-to-Desktop' + classs = 'modal modal-desktop' } const modal = await this.modalController.create({ @@ -88,7 +88,7 @@ export class ExpedientsPage implements OnInit { serialNumber: serialNumber, profile: this.profile, }, - cssClass: 'modal modal-desktop', + cssClass: classs, }); await modal.present(); modal.onDidDismiss().then((res)=>{