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

merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-07-21 10:21:10 +01:00
parent 65a67902d4 eaea73436f
commit 4143a2d007
8 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
+1 -1
View File
@@ -351,7 +351,7 @@
<ion-footer>
<div class="buttons">
<button class="btn-cancel" shape="round" (click)="close()">Cancelar</button>
<button class="btn-ok" shape="round" (click)="saveTask()">Adicionar</button>
<button class="btn-ok" shape="round" (click)="saveTask()">Gravar</button>
</div>
</ion-footer>
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
+5 -3
View File
@@ -14,9 +14,11 @@
color:#d30a0a !important;
}
.document-type{
color: #d30a0a;
margin-left: 20px;
font-size: medium;
border-radius: 20px;
background: var(--label-bg-color);
float: right;
padding: 5px 13.5px 5px 13.5px;
color: #fff;
}
.btn-size{
font-size: rem(18) !important;
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
+5 -3
View File
@@ -14,9 +14,11 @@
color:#d30a0a !important;
}
.document-type{
color: #d30a0a;
margin-left: 20px;
font-size: medium;
border-radius: 20px;
background: var(--label-bg-color);
float: right;
padding: 5px 13.5px 5px 13.5px;
color: #fff;
}
.btn-size{
font-size: rem(18) !important;
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
+1 -1
View File
@@ -72,7 +72,7 @@
<ion-label
(click)="viewDocument(attachment.DocId, attachment,attachment.content)"
>
<p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }} <span class="document-type" *ngIf="attachment.content != ''">Rascunho</span></p>
<p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }} <span class="document-type" *ngIf="attachment.content != ''">Rascunho</span></p>
<p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
<p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p>
</ion-label>
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
+8
View File
@@ -13,6 +13,14 @@ ion-content, .header-2, .main-content{
padding: 30px 20px 0 20px !important;
}
.document-type{
border-radius: 20px;
background: var(--label-bg-color);
float: right;
padding: 5px 13.5px 5px 13.5px;
color: #fff;
}
.document-type{
color: #d30a0a;
margin-left: 20px;
src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html
+1 -1
View File
@@ -8,7 +8,7 @@
<button class="btn-cancel" shape="round" (click)="close()">Cancelar</button>
</div>
<div *ngIf="content != ''" class="buttons">
<button (click)="save(Document, content)" class="btn-cancel" shape="round" >Salvar</button>
<!-- <button (click)="save(Document, content)" class="btn-cancel" shape="round" >Salvar</button> -->
<button (click)="saveDraft(Document, content)" class="btn-cancel" shape="round" >Salvar Rascunho</button>
<button class="btn-cancel" shape="round" (click)="close()">Cancelar</button>
</div>
src/assets/images/error_circle_warning.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

version/git-version.ts
+5 -5
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "4d7c80a73",
"SHA": "4d7c80a739c13184c1b8769a41cd16ea7c180b7c",
"shortSHA": "65a67902d",
"SHA": "65a67902d43d9ee65d9a8b323b926b96a6085904",
"branch": "developer-catch-merge",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Thu Jul 20 16:54:58 2023 +0100'",
"lastCommitTime": "'Fri Jul 21 10:12:55 2023 +0100'",
"lastCommitMessage": "fix",
"lastCommitNumber": "5087",
"lastCommitNumber": "5088",
"change": "",
"changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts",
"changeStatus": "On branch developer-catch-merge\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html\n\tnew file: src/assets/images/error_circle_warning.png\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}