peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 13:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-07-15 11:39:30 +01:00
parent eba2b7f9ce a953230249
commit d96b5cfacd
1436 changed files with 2958 additions and 3769 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/approve-event/approve-event.page.html
+3 -3
View File
@@ -83,14 +83,14 @@
<div class="overflow-y-auto">
<div class="middle-content">
<div *ngIf="loadedEvent.workflowInstanceDataFields.ParticipantsList">
<h5>Intervenientes</h5>
<h5 class="font-17-rem">Intervenientes</h5>
<div *ngFor="let att of loadedEvent.workflowInstanceDataFields.ParticipantsList">
<ion-label>{{att.Name}}</ion-label>
</div>
<div class="line"></div>
</div>
<div *ngIf="loadedEvent.workflowInstanceDataFields.Body">
<h5>Detalhes</h5>
<h5 class="font-17-rem">Detalhes</h5>
<ion-item lines="none" class="ion-no-margin ion-no-padding">
<pre class="width-100 text">{{ loadedEvent.workflowInstanceDataFields.Body }} </pre>
</ion-item>
@@ -100,7 +100,7 @@
<div *ngIf="loadedEvent.Documents" class="bottom-content width-100">
<ion-list>
<h5>Documentos Anexados </h5>
<h5 class="font-17-rem">Documentos Anexados </h5>
<ion-item class="ion-no-margin ion-no-padding cursor-pointer"
*ngFor="let attachment of loadedEvent.Documents"
(click)="viewDocument(attachment.DocId, attachment)">
src/app/shared/agenda/approve-event/approve-event.page.scss
+18 -16
View File
@@ -1,3 +1,5 @@
@import '~src/function.scss';
.display-none-true{
display: none;
border: 1px solid red;
@@ -7,13 +9,13 @@
.header-icon-left{
width: 36px;
font-size: 33px;
font-size: rem(33);
color: #42b9fe;
float: left;
}
.header-icon-right{
width: 45px;
font-size: 45px;
width: rem(45);
font-size: rem(45);
float: left;
margin-left: 5px;
}
@@ -21,7 +23,7 @@
.header-title{
font-family: Roboto;
font-size: 25px;
font-size: rem(25);
margin: 0 5px 0 5px;
padding: 0;
color:#000;
@@ -36,7 +38,7 @@
.upper-content{
margin-left: 40px;
font-size: 18px;
font-size: rem(18);
.content-location{
margin-top: 0px !important;
@@ -75,12 +77,12 @@
}
.content-details p{
font-size: 16px;
font-size: rem(16);
}
}
.middle-conten{
.middle-content h3, .middle-content p{
font-size: 16px;
font-size: rem(16);
}
}
@@ -88,11 +90,11 @@
margin: 0 auto;
.bottom-content h3{
font-size: 16px;
font-size: rem(16);
margin: 0 0 0 10px;
}
.attach-document{
font-size: 15px;
font-size: rem(15);
color: var(--title-text-color);
margin: 5px 5px 5px 10px;
padding: 5px;
@@ -100,23 +102,23 @@
}
.attach-icon{
width: 37px;
font-size: 35px;
font-size: rem(35);
float: left;
}
.attach-title-item{
width: 100%;
font-size: 15px;
font-size: rem(15);
color:#0d89d1;
}
/* SPAN */
.span-left{
float: left;
font-size: 15x;
font-size: rem(15);
}
.span-right{
text-align: right;
float: right;
font-size: 13px;
font-size: rem(13);
}
}
}
@@ -132,7 +134,7 @@
/* .arrow-right-icon{
width: 37px;
float: right;
font-size: 35px;
font-size: rem(35);
overflow: hidden;
} */
}
@@ -144,7 +146,7 @@
.btn-ok, .btn-cancel, .btn-delete{
height: auto !important;
font-size: 16px !important;
font-size: rem(16) !important;
width: 100% !important;
margin-bottom: 10px !important;
padding: 15px !important;
@@ -215,7 +217,7 @@
.delete{
padding: 7px;
font-size: 21px;
font-size: rem(21);
color:#fff;
background: #d30606;
border-radius: 20px;
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss
+22 -22
View File
@@ -1,5 +1,5 @@
@import '~src/function.scss';
.title-content::after, .header-md::after{
display: none;
}
@@ -27,12 +27,12 @@
}
.title{
font-size: 25px;
font-size: rem(25);
}
}
.ion-item-container{
margin: 15px auto;
margin: rem(15) auto;
border: 1px solid #ebebeb;
border-radius: 5px;
padding-left: 10px;
@@ -50,11 +50,11 @@
margin: 0px auto;
}
.ion-icon-class{
width: 45px;
height: 45px;
width: rem(45);
height: rem(45);
float: left;
padding: 10px;
font-size: 25px;
font-size: rem(25);
}
ion-select{
padding-left: 5px;
@@ -62,7 +62,7 @@
}
.ion-input-class{
width: calc(100% - 45px);
height: 45px;
height: rem(45);
border: 1px solid #ebebeb;
border-radius: 5px;
padding-left: 5px;
@@ -79,19 +79,19 @@
}
.add-people{
width: 45px;
width: rem(45);
float: right;
overflow: auto;
font-size: 25px;
height: 45px;
font-size: rem(25);
height: rem(45);
display: flex;
}
.list-people-title{
/* font-size: 13px; */
/* font-size: rem(13); */
color: #797979;
}
.attach-document{
font-size: 15px;
font-size: rem(15);
color: var(--title-text-color);
margin: 5px 5px 5px 10px;
padding: 5px;
@@ -99,39 +99,39 @@
}
.attach-icon{
width: 37px;
font-size: 35px;
font-size: rem(35);
float: left;
}
.attach-title-item{
width: 100%;
font-size: 15px;
font-size: rem(15);
color:var(--title-text-color);
}
/* SPAN */
.span-left{
float: left;
font-size: 15x;
font-size: rem(15);
}
.span-right{
text-align: right;
float: right;
font-size: 13px;
font-size: rem(13);
}
.container-footer{
margin:0 auto;
overflow: auto;
}
.button-cancel {
width: 170px;
height: 44px;
width: rem(170);
height: rem(44);
border-radius: 22.5px;
--background: #e0e9ee;
--color: #061b52;
margin:10px;
}
.button-save {
width: 170px;
height: 44px;
width: rem(170);
height: rem(44);
border-radius: 22.5px;
--background: #42b9fe;
--color:#ffffff;
@@ -149,7 +149,7 @@
/* Error Messages */
.error{
color:red;
font-size: 12px;
font-size: rem(12);
font-weight: bold;
padding-bottom: 20px;
}
@@ -175,7 +175,7 @@
align-items: center;
padding: 0px 5px;
color: white;
font-size: 9pt;
font-size: rem(12);
font-weight: 500;
height: 19px;
-webkit-border-radius: 18px;
src/app/shared/agenda/edit-event/edit-event.page.html
+4 -4
View File
@@ -233,8 +233,8 @@
</div>
<div class="add-people">
<button class="btn-no-color cursor-pointer" (click)="addParticipants()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
</button>
</div>
</div>
@@ -257,8 +257,8 @@
</div>
<div class="add-people">
<button class="btn-no-color cursor-pointer" (click)="addParticipantsCc()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35" slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="font-35-rem" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="font-35-rem" slot="start" src="assets/images/theme/gov/icons-arrow-forward.svg"></ion-icon>
</button>
</div>
</div>
src/app/shared/agenda/edit-event/edit-event.page.scss
+20 -19
View File
@@ -1,3 +1,4 @@
@import '~src/function.scss';
ion-content{
--background:transparent;
}
@@ -29,7 +30,7 @@ ion-content{
}
.title{
font-size: 25px;
font-size: rem(25);
}
}
@@ -43,7 +44,7 @@ ion-content{
.ion-item-container{
margin: 15px auto;
margin: rem(15) auto;
border: 1px solid #ebebeb;
border-radius: 5px;
padding-left: 10px;
@@ -60,11 +61,11 @@ ion-content{
margin: 0px auto;
}
.ion-icon-class{
width: 45px;
height: 45px;
width: rem(45);
height: rem(45);
float: left;
padding: 10px;
font-size: 25px;
font-size: rem(25);
}
ion-select{
padding-left: 5px;
@@ -72,7 +73,7 @@ ion-content{
}
.ion-input-class{
height: 45px;
height: rem(45);
border: 1px solid #ebebeb;
border-radius: 5px;
padding-left: 5px;
@@ -92,18 +93,18 @@ ion-content{
}
.add-people{
width: 45px;
width: rem(45);
float: right;
font-size: 25px;
height: 45px;
font-size: rem(25);
height: rem(45);
display: flex;
}
.list-people-title{
/* font-size: 13px; */
/* font-size: rem(13); */
color: #a3a3a3;
}
.attach-document{
font-size: 15px;
font-size: rem(15);
color: var(--title-text-color);
margin: 5px 5px 5px 10px;
padding: 5px;
@@ -111,30 +112,30 @@ ion-content{
}
.attach-icon{
width: 37px;
font-size: 35px;
font-size: rem(35);
float: left;
}
.attach-title-item{
width: 100%;
font-size: 15px;
font-size: rem(15);
color: var(--title-text-color);
}
/* SPAN */
.span-left{
float: left;
font-size: 15x;
font-size: rem(15);
}
.span-right{
text-align: right;
float: right;
font-size: 13px;
font-size: rem(13);
}
.container-footer{
margin:0 auto;
}
.button-cancel {
width: 170px;
height: 44px;
height: rem(44);
border-radius: 22.5px;
--background: #e0e9ee;
--color: #061b52;
@@ -142,7 +143,7 @@ ion-content{
}
.button-save {
width: 170px;
height: 44px;
height: rem(44);
border-radius: 22.5px;
--background: #42b9fe;
--color:#ffffff;
@@ -160,7 +161,7 @@ ion-content{
/* Error Messages */
.error{
color:red;
font-size: 12px;
font-size: rem(12);
font-weight: bold;
padding-bottom: 20px;
}
@@ -179,7 +180,7 @@ ion-content{
align-items: center;
padding: 0px 5px;
color: white;
font-size: 9pt;
font-size: rem(12);
font-weight: 500;
height: 19px;
-webkit-border-radius: 18px;
src/app/shared/agenda/event-list/event-list.page.html
+1 -1
View File
@@ -55,7 +55,7 @@
<p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</p>
<h3>{{event.workflowInstanceDataFields.Subject}}</h3>
<div *ngIf="event.activityInstanceName">
<div class="label-event-type"> {{ event.activityInstanceName }} </div>
<div class="label-event-type font-13-rem"> {{ event.activityInstanceName }} </div>
</div>
</div>
</div>
src/app/shared/agenda/event-list/event-list.page.scss
+7 -6
View File
@@ -1,3 +1,4 @@
@import '~src/function.scss';
:host{
margin: 0;
}
@@ -7,13 +8,13 @@
padding: 30px 20px 0 20px !important;
}
.header-icon-left{
font-size: 33px;
font-size: rem(33);
color: #42b9fe;
float: left;
}
.header-title{
font-family: Roboto;
font-size: 25px;
font-size: rem(25);
padding: 0;
color:#000;
float: left;
@@ -62,7 +63,7 @@
.approve-event-time p{
width: 33px;
font-family: Roboto;
font-size: 13px;
font-size: rem(13);
font-weight: normal;
font-stretch: normal;
font-style: normal;
@@ -79,7 +80,7 @@
.approve-event-detail p{
//width: 250px;
font-family: Roboto;
font-size: 13px;
font-size: rem(13);
font-weight: normal;
font-stretch: normal;
font-style: normal;
@@ -92,7 +93,7 @@
.approve-event-detail h3{
width: 250px;
font-family: Roboto;
font-size: 15px;
font-size: rem(15);
font-weight: bold;
font-stretch: normal;
font-style: normal;
@@ -112,5 +113,5 @@
background: #f05d5e;
border-radius: 17px;
color: white;
font-size: 10pt;
font-size: rem(13);
}
src/app/shared/agenda/new-event/new-event.page.scss
+24 -22
View File
@@ -1,4 +1,6 @@
ion-content{
@import '~src/function.scss';
ion-content{
--background:transparent;
}
@@ -33,7 +35,7 @@
}
.title{
font-size: 25px;
font-size: rem(25);
}
}
@@ -47,7 +49,7 @@
padding: 15px 20px 0 20px;
.ion-item-container{
margin: 15px auto;
margin: rem(15) auto;
border: 1px solid #ebebeb;
border-radius: 5px;
padding-left: 10px;
@@ -65,18 +67,18 @@
margin: 0px auto;
}
.ion-icon-class{
width: 45px;
height: 45px;
width: rem(45);
height: rem(45);
float: left;
padding: 10px;
font-size: 25px;
font-size: rem(25);
}
ion-select{
padding-left: 5px;
margin-left: 0;
}
.ion-input-class{
height: 45px;
height: rem(45);
border: 1px solid #ebebeb;
border-radius: 5px;
padding-left: 5px;
@@ -94,19 +96,19 @@
}
.add-people{
width: 45px;
width: rem(45);
float: right;
overflow: auto;
font-size: 25px;
height: 45px;
font-size: rem(25);
height: rem(45);
display: flex;
}
.list-people-title{
/* font-size: 13px; */
/* font-size: rem(13); */
color: #a3a3a3;
}
.attach-document{
font-size: 15px;
font-size: rem(15);
color: var(--title-text-color);
margin: 5px 5px 5px 10px;
padding: 5px;
@@ -114,39 +116,39 @@
}
.attach-icon{
width: 37px;
font-size: 35px;
font-size: rem(35);
float: left;
}
.attach-title-item{
width: 100%;
font-size: 15px;
font-size: rem(15);
color:#0d89d1;
}
/* SPAN */
.span-left{
float: left;
font-size: 15x;
font-size: rem(15);
}
.span-right{
text-align: right;
float: right;
font-size: 13px;
font-size: rem(13);
}
.container-footer{
margin:0 auto;
overflow: auto;
}
.button-cancel {
width: 170px;
height: 44px;
width: rem(170);
height: rem(44);
border-radius: 22.5px;
--background: #e0e9ee;
--color: #061b52;
margin:10px;
}
.button-save {
width: 170px;
height: 44px;
width: rem(170);
height: rem(44);
border-radius: 22.5px;
--background: #42b9fe;
--color:#ffffff;
@@ -164,7 +166,7 @@
/* Error Messages */
.error{
color:red;
font-size: 12px;
font-size: rem(12);
font-weight: bold;
padding-bottom: 20px;
}
@@ -187,7 +189,7 @@
align-items: center;
padding: 0px 5px;
color: white;
font-size: 9pt;
font-size: rem(12);
font-weight: 500;
height: 19px;
-webkit-border-radius: 18px;
src/app/shared/agenda/view-event/view-event.page.html
+15 -3
View File
@@ -22,6 +22,18 @@
<button class="btn-no-color" (click)="deleteYesOrNo()">
<ion-icon class="delete" name="trash-sharp"></ion-icon>
</button>
<!-- <div class="div-icon" (click)="openOptions()">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-menu.svg"></ion-icon>
</div>
<div *ngIf="loadedEvent.Subject">
<div (click)="editEvent()">Editar</div>
<div (click)="deleteYesOrNo()">Apagar</div>
<div id="desktop-create-chat-from-event" (click)="openNewGroupPage()">Criar Conversa</div>
</div> -->
</div>
</div>
@@ -70,7 +82,7 @@
<div class="line"></div>
<div class="middle-content">
<div *ngIf="loadedEvent.Attendees">
<h5>Intervenientes</h5>
<h5 class="font-17-rem">Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let attendee of loadedEvent.Attendees">
@@ -80,7 +92,7 @@
</ion-item>
</div>
<div *ngIf="loadedEvent.Body.Text">
<h5>Detalhes</h5>
<h5 class="font-17-rem">Detalhes</h5>
<ion-item lines="none" class="ion-no-margin ion-no-padding">
<pre class="text">{{ loadedEvent.Body.Text }} </pre>
</ion-item>
@@ -89,7 +101,7 @@
</div>
<div *ngIf="loadedEvent.Attachments" class="bottom-content width-100">
<h5>Documentos Anexados</h5>
<h5 class="font-17-rem">Documentos Anexados</h5>
<ion-list class="width-100">
<li *ngFor="let attach of loadedEvent.Attachments; let i = index" class="width-100" lines="none" class="ion-no-margin ion-no-padding pa-0">
<ion-label class="width-100 d-flex align-center">
src/app/shared/agenda/view-event/view-event.page.scss
+22 -19
View File
@@ -1,9 +1,11 @@
@import '~src/function.scss';
ion-content{
--background:transparent;
--padding-top:0px;
--padding-start: 20px;
--padding-end: 20px;
font-size: 18px;
font-size: rem(18);
overflow: auto;
}
@@ -33,7 +35,7 @@ ion-content{
.left{
width: 37px;
float: left;
font-size: 35px;
font-size: rem(35);
}
.middle{
@@ -49,8 +51,8 @@ ion-content{
}
.header-icon-right{
width: 45px;
font-size: 45px;
width: rem(45);
font-size: rem(45);
float: right;
}
@@ -67,12 +69,12 @@ ion-content{
}
.div-icon .edit{
font-size: 35px;
font-size: rem(35);
float: left;
}
.div-icon .delete{
padding: 7px;
font-size: 21px;
font-size: rem(21);
color:#fff;
background: #d30606;
border-radius: 20px;
@@ -81,7 +83,7 @@ ion-content{
}
.title{
font-size: 25px;
font-size: rem(25);
}
}
@@ -96,7 +98,7 @@ ion-content{
.upper-content{
width: calc(100%-50px);
margin-left: 50px;
font-size: 18px;
font-size: rem(18);
.content-location{
width: 100%;
@@ -116,18 +118,19 @@ ion-content{
float: right !important;
padding: 5px 13.5px 5px 13.5px;
color: #fff;
font-size: rem(14);
}
}
.location-detail{
font-weight: 700;
font-size: 18px;
font-size: rem(18);
float: left;
margin: 5px 5px 5px 0px;
}
.button-calendar-type ion-button{
height: 25px;
height: rem(25);
}
.button-edit-event {
width: 140px;
@@ -137,7 +140,7 @@ ion-content{
--color:#061b52;
}
.content-details p{
font-size: 16px;
font-size: rem(16);
}
}
.line{
@@ -150,7 +153,7 @@ ion-content{
overflow: auto;
.middle-content h3, .middle-content p{
font-size: 16px;
font-size: rem(16);
}
}
@@ -158,11 +161,11 @@ ion-content{
margin: 0 auto;
.bottom-content h3{
font-size: 16px;
font-size: rem(16);
margin: 0 0 0 10px;
}
.attach-document{
font-size: 15px;
font-size: rem(15);
color: var(--title-text-color);
margin: 5px 5px 5px 10px;
padding: 5px;
@@ -170,24 +173,24 @@ ion-content{
}
.attach-icon{
width: 37px;
font-size: 35px;
font-size: rem(35);
float: left;
}
.attach-title-item{
width: 100%;
font-size: 15px;
font-size: rem(15);
color:#0d89d1;
/* color:var(--title-text-color); */
}
/* SPAN */
.span-left{
float: left;
font-size: 15x;
font-size: rem(15);
}
.span-right{
text-align: right;
float: right;
font-size: 13px;
font-size: rem(13);
}
}
}
@@ -205,7 +208,7 @@ ion-content{
cursor: pointer;
display: flex;
justify-content: center;
width: 35px;
width: rem(35);
height: 41px;
align-items: center;
}