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 with Peter chnages 3

Browse Source
This commit is contained in:
Eudes Inácio
2023-02-27 17:44:15 +01:00
parent 46387d4977 2964c3d4cd
commit 1957853678
10 changed files with 45 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+7 -7
View File
@@ -99,7 +99,7 @@
"angular-svg-icon": "^12.0.0",
"angular-tag-cloud-module": "^5.2.2",
"base64-js": "^1.5.1",
"beast-orm": "^1.1.2",
"beast-orm": "^1.1.3",
"bootstrap": "^4.5.0",
"browser-image-resizer": "^2.4.1",
"build": "0.1.4",
@@ -8833,9 +8833,9 @@
}
},
"node_modules/beast-orm": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.1.2.tgz",
"integrity": "sha512-yboyvvasEIptcLNJ0yLl6DalQ2xSAUojNS/vPrPRir4gW99g6GFqlSiSWWTpCE4FHh827TuB8NUWbhLcqzoiyA=="
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.1.3.tgz",
"integrity": "sha512-stZiiliGzvP1b2BPHGo2l2gZlw9CgrnpMhOLvvC1e3JekbSrOFIGt1/kwNMfLhg81c2ZHpfRBnNo5Nw6NQxzRw=="
},
"node_modules/big-integer": {
"version": "1.6.49",
@@ -45616,9 +45616,9 @@
}
},
"beast-orm": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.1.2.tgz",
"integrity": "sha512-yboyvvasEIptcLNJ0yLl6DalQ2xSAUojNS/vPrPRir4gW99g6GFqlSiSWWTpCE4FHh827TuB8NUWbhLcqzoiyA=="
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/beast-orm/-/beast-orm-1.1.3.tgz",
"integrity": "sha512-stZiiliGzvP1b2BPHGo2l2gZlw9CgrnpMhOLvvC1e3JekbSrOFIGt1/kwNMfLhg81c2ZHpfRBnNo5Nw6NQxzRw=="
},
"big-integer": {
"version": "1.6.49"
package.json
+1 -1
View File
@@ -109,7 +109,7 @@
"angular-svg-icon": "^12.0.0",
"angular-tag-cloud-module": "^5.2.2",
"base64-js": "^1.5.1",
"beast-orm": "^1.1.2",
"beast-orm": "^1.1.3",
"bootstrap": "^4.5.0",
"browser-image-resizer": "^2.4.1",
"build": "0.1.4",
readme.md
+4 -1
View File
@@ -77,7 +77,10 @@ cp -r ./www ./serve
npm run dev:share
```
# Open xcode
ionic cap copy &&
ionic cap update &&
ionic cap open ios &&
## Tag stable version
src/app/modals/view-document/view-document.page.html
+2 -7
View File
@@ -18,12 +18,7 @@
</ion-header>
<ion-content class="pt-10 height-100">
<div class="height-100" *ngIf="trustedUrl">
<iframe id="iframe" [src]="trustedUrl" height="100%" width="100%" title="Iframe Example"></iframe>
<div class="height-100 container-img">
<iframe class="iframe" [src]="trustedUrl" height="100%" width="100%" title="Iframe Example"></iframe>
</div>
<div *ngIf="!trustedUrl" style="text-align: center; color: #0d89d1" class=" height-100 width-100 d-flex align-center justify-center">
Estamos a preparar a visualização do documento. Por favor aguarde.
</div>
</ion-content>
src/app/modals/view-document/view-document.page.scss
+8
View File
@@ -9,3 +9,11 @@
float: right;
margin-left: auto;
}
.container-img {
background-image: url(/assets/gif/theme/gov/Blocks-loader.svg);
background-repeat: no-repeat;
background-position-x: center;
background-position-y: center;
}
src/app/modals/view-document/view-document.page.ts
+9
View File
@@ -7,6 +7,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
import { EventDetailsDocumentsOptionsPage } from 'src/app/shared/popover/event-details-documents-options/event-details-documents-options.page';
import { DocumentSetUpMeetingPage } from '../document-set-up-meeting/document-set-up-meeting.page';
import { AlertController, ModalController } from '@ionic/angular';
@Component({
selector: 'app-view-document',
templateUrl: './view-document.page.html',
@@ -20,6 +21,7 @@ export class ViewDocumentPage implements OnInit {
docId: any
task: ExpedientTaskModalPageNavParamsTask;
Document: any
loader = true
constructor(
private modalController: ModalController,
@@ -49,6 +51,13 @@ export class ViewDocumentPage implements OnInit {
const link: string = res.replace('//pdfjs/web/', '/pdfjs/web/')
this.trustedUrl = this.sanitazer.bypassSecurityTrustResourceUrl(link);
// const iframe = document.getElementById("iframe")
// const handleLoad = () => {
// this.loader = false
// };
// iframe.addEventListener('load', handleLoad, true)
if(res == "") {
const alert = await this.alertController.create({
cssClass: 'my-custom-class',
src/app/pipes/filter.pipe.ts
+4
View File
@@ -13,6 +13,10 @@ export class FilterPipe implements PipeTransform {
text = text.toLowerCase();
if(Array.isArray(array)) {
array = []
}
return array.filter(item =>{
return item[column].toLowerCase().includes(text);
});
src/app/shared/chat/group-messages/group-messages.page.html
+2 -2
View File
@@ -49,7 +49,7 @@
<button (click)="deleteMessage(msg._id)" class="menuButton">Apagar mensagem</button>
</mat-menu>
</div>
<div class="title">
<div class="title d-flex">
<ion-label>{{msg.u.name}}</ion-label>
<span class="time">{{msg.duration}}</span>
</div>
@@ -80,7 +80,7 @@
<button (click)="deleteMessage(msg._id)" class="menuButton">Apagar mensagem</button>
</mat-menu>
</div>
<div class="title">
<div class="title d-flex">
<ion-label>{{msg.u.name}}</ion-label>
<span class="time">{{msg.duration}}</span>
</div>
src/app/shared/chat/messages/messages.page.html
+2 -2
View File
@@ -48,7 +48,7 @@
<button (click)="deleteMessage(msg._id, msg)" class="menuButton">Apagar mensagem</button>
</mat-menu>
</div>
<div class="title">
<div class="title d-flex">
<ion-label >{{msg.u.name}}</ion-label>
<span class="time">{{msg.duration}}</span>
</div>
@@ -82,7 +82,7 @@
<button (click)="deleteMessage(msg._id, msg)" class="menuButton">Apagar mensagem</button>
</mat-menu>
</div>
<div class="title">
<div class="title d-flex">
<ion-label >{{msg.u.name}}</ion-label>
<span class="time">{{msg.duration}}</span>
</div>
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "fcd198933",
"SHA": "fcd19893340c5359c9892506349adce885099066",
"shortSHA": "46387d497",
"SHA": "46387d4977fb03d124a76a274e70dd9ff1c31b32",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Mon Feb 27 09:45:31 2023 +0100'",
"lastCommitMessage": "Merge made with Peter changes",
"lastCommitNumber": "4831",
"lastCommitTime": "'Mon Feb 27 17:39:10 2023 +0100'",
"lastCommitMessage": "to many changes",
"lastCommitNumber": "4832",
"change": "",
"changeStatus": "On branch no_bug_movemente\nYour branch is ahead of 'origin/no_bug_movemente' by 3 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/view-event/view-event.page.ts\n\tmodified: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/agenda/view-event/view-event.page.ts\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.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/publications/edit-action/edit-action.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pages/publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/services/http-error-handle.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified: src/app/shared/popover/request-options/request-options.page.ts\n\tmodified: src/app/shared/publication/edit-action/edit-action.page.html\n\tmodified: src/app/shared/publication/new-action/new-action.page.html\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.ts\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts",
"changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 4 and 5 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: readme.md\n\tmodified: src/app/modals/view-document/view-document.page.html\n\tmodified: src/app/modals/view-document/view-document.page.scss\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/pipes/filter.pipe.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.html",
"changeAuthor": "eudes.inacio"
}