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

Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-07-12 11:20:59 +01:00
parent 68f666263b c819ebfd3e
commit d68a89e7c9
52 changed files with 7811 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.editorconfig
+13
View File
@@ -0,0 +1,13 @@
# editorconfig.org
root = true
[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
[*.md]
trim_trailing_whitespace = false
.env.example
+4
View File
@@ -0,0 +1,4 @@
PUPPETEER_HOST = http://127.0.0.1:8080
PUPPETEER_PORT = 8080
PUPPETEER_OPEN_CHROME = true
.gitignore
+2 -1
View File
@@ -38,4 +38,5 @@ npm-debug.log*
src/app/architect/
src/environments/environment.e2e.ts
src/environments/environment.e2e.ts
.env
git
View File
jest-puppeteer.config.js
+20
View File
@@ -0,0 +1,20 @@
// jest-puppeteer.config.js
require('dotenv').config()
const port = process.env.PUPPETEER_PORT
const host = process.env.PUPPETEER_HOST
const openChrome = process.env.PUPPETEER_OPEN_CHROME
module.exports = {
server: {
command: `http-server -a 127.0.0.1 --port ${port} ./www`,
port: port,
launchTimeout: 5000
},
launch: {
dumpio: true,
headless: openChrome != 'true',
product: 'chrome',
},
browserContext: 'default',
}
jest.config.js
+15
View File
@@ -0,0 +1,15 @@
module.exports = {
"roots": [
"<rootDir>/test"
],
"testMatch": [
"**/__tests__/**/*.+(ts|tsx|js)",
"**/?(*.)+(spec|test).+(ts|tsx|js)"
],
"transform": {
"^.+\\.(ts|tsx)$": "ts-jest"
},
// "globalSetup": "<rootDir>/test/setupJest.ts",
preset: 'jest-puppeteer',
// setupFilesAfterEnv: "<rootDir>/test/setupJest.ts",
}
package-lock.json
Generated
+7151 -36
View File
File diff suppressed because it is too large Load Diff
package.json
+15 -2
View File
@@ -7,9 +7,10 @@
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
"e2e": "ng e2e",
"nice": "node server.js",
"test": "jest --detectOpenHandles --runInBand"
},
"private": true,
"dependencies": {
@@ -52,6 +53,8 @@
"@logisticinfotech/ionic4-datepicker": "^1.4.4",
"@ng-bootstrap/ng-bootstrap": "^9.1.2",
"@ngx-translate/core": "^13.0.0",
"@types/jest-environment-puppeteer": "^4.4.1",
"@types/puppeteer": "^5.4.4",
"angular-calendar": "^0.28.22",
"angular-tag-cloud-module": "^5.2.2",
"bootstrap": "^4.5.0",
@@ -65,19 +68,25 @@
"crypto-js": "^4.0.0",
"date-fns": "^2.17.0",
"depd": "^2.0.0",
"dotenv": "^10.0.0",
"global": "^4.4.0",
"http-server": "^0.12.3",
"ibm-mfp-web-push": "^8.0.2020052213",
"ibm-mfp-web-sdk": "^8.0.2021021706",
"ionic-angular": "^3.9.10",
"ionic-selectable": "^4.7.1",
"ionic2-alpha-scroll": "^2.0.1",
"ionic2-calendar": "^0.6.6",
"jest-puppeteer": "^5.0.4",
"jetifier": "^1.6.6",
"moment": "^2.29.1",
"ngx-socket-io": "^3.2.0",
"puppeteer": "^10.1.0",
"rxjs": "~6.6.3",
"rxjs-compat": "^6.6.7",
"sharp": "^0.25.4",
"socket.io-client": "^2.3.0",
"ts-jest": "^27.0.3",
"tslib": "^2.0.0",
"uuidv4": "^6.2.11",
"wordcloud": "^1.1.2",
@@ -94,6 +103,7 @@
"@ionic/lab": "3.1.7",
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.3",
"@types/jest": "^26.0.24",
"@types/node": "^12.11.1",
"codelyzer": "^6.0.0",
"cordova-android": "^9.1.0",
@@ -117,12 +127,15 @@
"cordova-plugin-whitelist": "^1.3.4",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0",
"jest": "^27.0.6",
"jest-preset-angular": "^9.0.4",
"karma": "~5.0.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"protractor": "~7.0.0",
"ts-jest-puppeteer": "0.0.5",
"ts-node": "~8.3.0",
"tslint": "~6.1.0",
"typescript": "^4.1.5"
readme.md
+48
View File
@@ -0,0 +1,48 @@
# Gabinete Digital
## Requirements
[node >= 14](https://nodejs.org/dist/v14.17.3/node-v14.17.3-x64.msi)
## Installation
Use the package manager npm to install dependencies.
```bash
npm ci
npm install
npm install -g @ionic/cli
npm install -g http-server
npm install -g @angular/cli
```
## Start the development server
```bash
ionic serve
```
## build for production and launch server
```bash
ionic serve build --prod
npm run start
```
## Run test[.](#run-test)
```bash
# incase you don't have .env file
cp ./.env.example ./.env
# incase you don't have a local build yet
ionic serve build --prod
npm run test
```
## Contributing
For major changes, please open an issue first to discuss what you would like to change.
Please make sure to update tests as appropriate.
src/app/modals/create-process/create-process.page.ts
+14
View File
@@ -235,6 +235,8 @@ export class CreateProcessPage implements OnInit {
});
this.dispatchFolder.SubjectTypes = this.selectedTypes;
const loader = this.toastService.loading()
switch (this.loggeduser.Profile) {
case 'MDGPR':
@@ -253,8 +255,10 @@ export class CreateProcessPage implements OnInit {
try {
await this.processes.postDespatcho(this.postData).toPromise();
this.FinalizarDespacho('Despacho criado');
loader.remove()
} catch (error) {
this.toastService.badRequest('Processo não efectuado');
loader.remove()
}
break;
@@ -272,9 +276,11 @@ export class CreateProcessPage implements OnInit {
try {
await this.processes.postParecer(this.postData).toPromise();
this.FinalizarParecer('Pedido de Parecer enviado');
loader.remove()
}
catch (error) {
this.toastService.badRequest('Processo não efectuado');
loader.remove()
}
break;
@@ -292,9 +298,11 @@ export class CreateProcessPage implements OnInit {
try {
await this.processes.postDeferimento(this.postData).toPromise();
this.FinalizarDeferimento('Pedido de deferimento enviado');
loader.remove()
}
catch (error) {
this.toastService.badRequest('Processo não efectuado');
loader.remove()
}
break;
}
@@ -317,8 +325,10 @@ export class CreateProcessPage implements OnInit {
try {
await this.processes.postDespatcho(this.postData).toPromise();
loader.remove()
this.executado('Despacho criado');
} catch (error) {
loader.remove()
this.toastService.badRequest('Processo não efectuado');
}
@@ -337,9 +347,11 @@ export class CreateProcessPage implements OnInit {
try {
await this.processes.postParecer(this.postData).toPromise();
this.executado();
loader.remove()
this.toastService.successMessage('Pedido de Parecer criado');
}
catch (error) {
loader.remove()
this.toastService.badRequest('Processo não efectuado');
}
@@ -358,9 +370,11 @@ export class CreateProcessPage implements OnInit {
try {
await this.processes.postDeferimento(this.postData).toPromise();
this.executado();
loader.remove()
this.toastService.successMessage('Pedido de Deferimento criado');
}
catch (error) {
loader.remove()
this.toastService.badRequest('Processo não efectuado');
}
src/app/pages/agenda/agenda.page.ts
+6 -1
View File
@@ -24,6 +24,7 @@ import { NewEventPage } from './new-event/new-event.page';
import { AuthService } from 'src/app/services/auth.service';
import { User } from 'src/app/models/user.model';
import { DateAdapter } from '@angular/material/core';
import { ToastService } from 'src/app/services/toast.service';
@Component({
selector: 'app-agenda',
@@ -158,7 +159,8 @@ export class AgendaPage implements OnInit {
private alertController: AlertService,
private sanitizer: DomSanitizer,
authService: AuthService,
private dateAdapter: DateAdapter<any>
private dateAdapter: DateAdapter<any>,
private toastService: ToastService
) {
this.dateAdapter.setLocale('es');
@@ -181,6 +183,9 @@ export class AgendaPage implements OnInit {
}
ngOnInit() {
// const loader = this.toastService.loading()
this.profile = "mdgpr";
const pathname = window.location.pathname
src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+20
View File
@@ -60,13 +60,20 @@ export class EventActionsPopoverPage implements OnInit {
let body = { "serialNumber": this.serialNumber, "action": "Aprovar" }
console.log(body);
const loader = this.toastService.loading()
try {
this.processes.PostTaskAction(body).toPromise()
this.toastService.successMessage();
this.goBack();
} catch (error) {
this.toastService.badRequest()
}
finally {
loader.remove()
}
}
async emendarTask() {
@@ -95,6 +102,8 @@ export class EventActionsPopoverPage implements OnInit {
}
console.log(body);
const loader = this.toastService.loading()
try {
await this.processes.PostTaskAction(body).toPromise();
this.toastService.successMessage('Pedido enviado');
@@ -102,6 +111,9 @@ export class EventActionsPopoverPage implements OnInit {
} catch (error) {
this.toastService.badRequest();
}
finally {
loader.remove()
}
}
else{
//this.alertService.presentAlert('Operação cancelada!');
@@ -112,13 +124,21 @@ export class EventActionsPopoverPage implements OnInit {
async rejeitar(){
let body = { "serialNumber": this.serialNumber, "action": "Rejeitar" }
console.log(body);
const loader = this.toastService.loading()
try {
this.processes.PostTaskAction(body).toPromise();
await this.toastService.successMessage('Processo rejeitado');
this
this.goBack();
} catch (error) {
this.toastService.badRequest()
}
finally {
loader.remove()
}
}
async editTask() {
src/app/pages/agenda/new-event/new-event.page.ts
+5 -1
View File
@@ -234,6 +234,8 @@ export class NewEventPage implements OnInit {
try {
const loader = this.toastService.loading()
if(this.loggeduser.Profile == 'MDGPR') {
console.log(this.loggeduser.Profile);
@@ -241,12 +243,14 @@ export class NewEventPage implements OnInit {
eventId = await this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).toPromise();
console.log(eventId);
loader.remove()
}
else if(this.loggeduser.Profile == 'PR'){
console.log(this.loggeduser.Profile);
eventId = await this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).toPromise();
loader.remove()
}
const DocumentToSave: EventAttachment[] = this.documents.map((e) => {
@@ -266,7 +270,7 @@ export class NewEventPage implements OnInit {
try {
await this.attachmentsService.setEventAttachmentById(attachments).toPromise();
} catch(error) {
alert('document error')
console.log('document not save')
}
});
src/app/pages/agenda/view-event/view-event.page.ts
+7 -1
View File
@@ -137,7 +137,9 @@ export class ViewEventPage implements OnInit {
});
}
getAttachments(){
getAttachments() {
const loader = this.toastService.loading()
try {
this.attachmentsService.getAttachmentsById(this.eventId).subscribe(res=>{
this.loadedAttachments = res;
@@ -146,6 +148,10 @@ export class ViewEventPage implements OnInit {
} catch (error) {
}
finally {
loader.remove()
}
}
async editEventDetail() {
src/app/pages/chat/messages/messages.page.ts
+6 -2
View File
@@ -5,6 +5,7 @@ import { ContactsPage } from 'src/app/pages/chat/messages/contacts/contacts.page
import { AlertService } from 'src/app/services/alert.service';
import { AuthService } from 'src/app/services/auth.service';
import { ChatService } from 'src/app/services/chat.service';
import { ToastService } from 'src/app/services/toast.service';
import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page';
import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/messages-options.page';
@@ -34,6 +35,7 @@ export class MessagesPage implements OnInit, AfterViewChecked {
private chatService: ChatService,
private authService: AuthService,
private alertService: AlertService,
private toastService: ToastService,
) {
this.roomId = this.navParams.get('roomId');
}
@@ -73,9 +75,11 @@ export class MessagesPage implements OnInit, AfterViewChecked {
this.scrollToBottom();
}
scrollToBottom(): void {
try {
this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
} catch(err) { }
this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
} catch(err) { }
}
loadMoreMessages(ev:any){
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+18
View File
@@ -190,6 +190,8 @@ export class DespachoPrPage implements OnInit {
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
@@ -197,6 +199,10 @@ export class DespachoPrPage implements OnInit {
} catch(error) {
this.toastService.badRequest()
}
finally {
loader.remove()
}
}
async arquivar(note:string, documents:any){
@@ -209,6 +215,9 @@ export class DespachoPrPage implements OnInit {
},
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.toastService.successMessage('Processo arquivado')
@@ -216,6 +225,10 @@ export class DespachoPrPage implements OnInit {
} catch (error) {
this.toastService.badRequest('Processo não arquivado')
}
finally {
loader.remove()
}
}
@@ -230,6 +243,8 @@ export class DespachoPrPage implements OnInit {
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.toastService.successMessage('Processo criado')
@@ -237,6 +252,9 @@ export class DespachoPrPage implements OnInit {
} catch (error) {
this.toastService.badRequest('Processo não criado')
}
finally {
loader.remove()
}
}
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+22
View File
@@ -187,6 +187,8 @@ export class DespachoPage implements OnInit {
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
@@ -194,6 +196,9 @@ export class DespachoPage implements OnInit {
} catch(error) {
this.toastService.badRequest("Processo não criado")
}
finally {
loader.remove()
}
}
async arquivar(note:string, documents:any){
@@ -206,6 +211,8 @@ export class DespachoPage implements OnInit {
},
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.toastService.successMessage('Processo descartado')
@@ -213,6 +220,9 @@ export class DespachoPage implements OnInit {
} catch (error) {
this.toastService.badRequest("Processo não descartado")
}
finally {
loader.remove()
}
}
@@ -226,6 +236,9 @@ export class DespachoPage implements OnInit {
},
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.toastService.successMessage()
@@ -233,6 +246,10 @@ export class DespachoPage implements OnInit {
} catch (error) {
this.toastService.badRequest()
}
finally {
loader.remove()
}
}
async reexecute(note:string, documents:any) {
@@ -246,6 +263,8 @@ export class DespachoPage implements OnInit {
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.toastService.successMessage()
@@ -254,6 +273,9 @@ export class DespachoPage implements OnInit {
} catch (error) {
this.toastService.badRequest()
}
finally {
loader.remove()
}
}
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+7
View File
@@ -154,6 +154,9 @@ export class DiplomaAssinarPage implements OnInit {
},
"AttachmentList": [],
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
@@ -163,6 +166,10 @@ export class DiplomaAssinarPage implements OnInit {
} catch (error) {
this.toastService.badRequest()
}
finally {
loader.remove()
}
}
close() {
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+17
View File
@@ -168,6 +168,9 @@ export class DiplomaPage implements OnInit {
},
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
@@ -178,6 +181,9 @@ export class DiplomaPage implements OnInit {
} catch (error) {
this.toastService.badRequest()
}
finally {
loader.remove()
}
}
async askToChange(note:string, documents:any){
@@ -191,12 +197,17 @@ export class DiplomaPage implements OnInit {
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.toastService.successMessage()
} catch (error) {
this.toastService.badRequest()
}
finally {
loader.remove()
}
}
async finish(note:string, documents:any){
@@ -210,12 +221,18 @@ export class DiplomaPage implements OnInit {
},
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise();
this.toastService.successMessage('Processo concluído')
} catch (error) {
this.toastService.badRequest()
}
finally {
loader.remove()
}
}
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+16 -1
View File
@@ -102,6 +102,9 @@ export class ApproveEventModalPage implements OnInit {
console.log('approveTask SERIALNUMBER: ', serialNumber)
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
console.log(body);
const loader = this.toastService.loading()
try {
await this.processes.PostTaskAction(body).toPromise()
@@ -112,6 +115,9 @@ export class ApproveEventModalPage implements OnInit {
} catch (error) {
this.toastService.badRequest('Evento não aprovado')
}
finally {
loader.remove()
}
}
@@ -128,6 +134,8 @@ export class ApproveEventModalPage implements OnInit {
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
const loader = this.toastService.loading()
try {
await this.processes.PostTaskAction(body).toPromise()
@@ -136,6 +144,9 @@ export class ApproveEventModalPage implements OnInit {
})
} catch (error) {
this.toastService.badRequest('Evento não rejeitado')
}
finally {
loader.remove()
}
this.modalController.dismiss(null);
@@ -183,7 +194,8 @@ export class ApproveEventModalPage implements OnInit {
}
//console.log(body);
const loader = this.toastService.loading()
try {
await this.processes.PostTaskAction(body).toPromise()
this.router.navigate(['/home/gabinete-digital/event-list']);
@@ -191,6 +203,9 @@ export class ApproveEventModalPage implements OnInit {
} catch (error) {
this.toastService.badRequest()
this.router.navigate(['/home/gabinete-digital/event-list']);
}
finally {
loader.remove()
}
}
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+22 -1
View File
@@ -97,6 +97,8 @@ export class ApproveEventPage implements OnInit {
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
console.log(body);
const loader = this.toastService.loading()
try {
await this.processes.PostTaskAction(body).toPromise()
this.toastService.successMessage();
@@ -105,6 +107,9 @@ export class ApproveEventPage implements OnInit {
} catch (error) {
this.toastService.badRequest()
}
finally {
loader.remove()
}
/* this.approveEventDismiss.emit({
@@ -144,13 +149,18 @@ export class ApproveEventPage implements OnInit {
}
console.log(body);
const loader = this.toastService.loading()
try {
await this.processes.PostTaskAction(body).toPromise();
this.toastService.successMessage('Pedido enviado');
this.goBack();
} catch (error) {
this.toastService.badRequest();
} finally {
loader.remove()
}
}
else{
//this.alertService.presentAlert('Operação cancelada!');
@@ -164,6 +174,7 @@ export class ApproveEventPage implements OnInit {
async rejeitar(serialNumber:string){
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
console.log(body);
const loader = this.toastService.loading()
try {
this.processes.PostTaskAction(body).toPromise();
await this.toastService.successMessage('Processo rejeitado');
@@ -171,9 +182,14 @@ export class ApproveEventPage implements OnInit {
} catch (error) {
this.toastService.badRequest()
}
finally {
loader.remove()
}
}
async getAttachments(instanceId:string){
const loader = this.toastService.loading()
try {
this.loadedAttachments = await this.attachmentsService.getAttachmentsById(instanceId).toPromise();
@@ -233,13 +249,18 @@ export class ApproveEventPage implements OnInit {
}
console.log(body);
try {
const loader = this.toastService.loading()
try {
await this.processes.PostTaskAction(body).toPromise();
this.toastService.successMessage();
this.goBack();
} catch (error) {
this.toastService.badRequest();
} finally {
loader.remove()
}
}
else{
//this.alertService.presentAlert('Operação cancelada!');
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+8 -1
View File
@@ -252,7 +252,7 @@ export class BookMeetingModalPage implements OnInit {
console.log(this.postData);
if(this.task.FsId == '8') {
const loader = this.toastService.loading()
try {
switch (this.loggeduser.Profile) {
case 'MDGPR':
@@ -271,10 +271,14 @@ export class BookMeetingModalPage implements OnInit {
} catch (error) {
this.toastService.badRequest('Reunião não criada')
}
finally {
loader.remove()
}
}
else if(this.task.FsId == '361') {
const loader = this.toastService.loading()
try {
switch (this.loggeduser.Profile) {
case 'MDGPR':
@@ -290,7 +294,10 @@ export class BookMeetingModalPage implements OnInit {
} catch (error) {
this.toastService.badRequest()
} finally {
loader.remove()
}
}
}
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+22 -6
View File
@@ -271,6 +271,8 @@ export class ExpedientTaskModalPage implements OnInit {
DispatchFolder: this.dispatchFolder,
AttachmentList: docs,
}
const loader = this.toastService.loading()
try {
let action_despacho = {
"serialNumber": this.task.serialNumber,
@@ -291,6 +293,8 @@ export class ExpedientTaskModalPage implements OnInit {
} catch (error) {
loader.remove()
await this.toastService.badRequest('Processo não efetuado')
} finally {
loader.remove()
}
console.log('this.taskResult', this.taskResult);
break;
@@ -336,6 +340,8 @@ export class ExpedientTaskModalPage implements OnInit {
AttachmentList: docs
}
//console.log(this.postData);
const loader1 = this.toastService.loading()
try {
let action_deferimento = {
"serialNumber": this.task.serialNumber,
@@ -346,14 +352,15 @@ export class ExpedientTaskModalPage implements OnInit {
}
}
this.taskResult = await this.processes.postDeferimento(this.postData).toPromise();
loader.remove()
await this.toastService.successMessage('Processo efetuado');
this.modalController.dismiss(action_deferimento);
} catch (error) {
loader.remove()
await this.toastService.badRequest('Processo não efetuado')
} finally {
loader1.remove()
}
console.log('this.taskResult', this.taskResult);
break;
}
@@ -375,6 +382,8 @@ export class ExpedientTaskModalPage implements OnInit {
AttachmentList: docs,
}
console.log(this.postData);
const loader = this.toastService.loading()
try {
let action_despacho_pr = {
"serialNumber": this.task.serialNumber,
@@ -394,7 +403,10 @@ export class ExpedientTaskModalPage implements OnInit {
} catch (error) {
loader.remove()
await this.toastService.badRequest('Processo não efetuado')
} finally {
loader.remove()
}
console.log('this.taskResult', this.taskResult);
break;
@@ -408,7 +420,9 @@ export class ExpedientTaskModalPage implements OnInit {
DispatchFolder: this.dispatchFolder,
AttachmentList: docs
}
const loader2 = this.toastService.loading()
try {
let action_parecer_pr = {
"serialNumber": this.task.serialNumber,
@@ -418,15 +432,17 @@ export class ExpedientTaskModalPage implements OnInit {
"Note": "",
}
}
loader.remove()
this.taskResult = await this.processes.postParecerPr(this.postData).toPromise();
await this.toastService.badRequest('Processo não efetuado');
this.modalController.dismiss(action_parecer_pr);
} catch (error) {
loader.remove()
await this.toastService.badRequest('Processo não efetuado')
} finally {
loader2.remove()
}
break;
}
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+11
View File
@@ -246,12 +246,16 @@ export class ExpedienteDetailPage implements OnInit {
}
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(otherbody).toPromise()
this.toastService.successMessage('Processo descartado');
this.goBack();
} catch (error) {
this.toastService.badRequest('Processo não descartado')
} finally {
loader.remove()
}
}
@@ -261,23 +265,30 @@ export class ExpedienteDetailPage implements OnInit {
}
else{
if(res['data']== 'Yes'){
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise();
this.toastService.successMessage('Processo descartado');
this.goBack();
} catch (error) {
this.toastService.badRequest('Processo não descartado')
} finally {
loader.remove()
}
this.goBack();
}
else if(res['data'] == 'No'){
console.log('Update');
const loader = this.toastService.loading()
try {
await this.processes.UpdateTaskStatus(this.task.FolderId).toPromise();
this.toastService.successMessage();
this.goBack();
} catch (error) {
this.toastService.badRequest()
} finally {
loader.remove()
}
}
}
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+24
View File
@@ -231,13 +231,18 @@ export class ExpedientePrPage implements OnInit {
console.log(body);
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise();
this.close();
this.toastService.successMessage('Processo aprovado')
} catch(error) {
this.toastService.badRequest('Processo não aprovado')
} finally {
loader.remove()
}
}
async sendToReview(note:string, documents:any){
@@ -251,12 +256,16 @@ export class ExpedientePrPage implements OnInit {
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
this.toastService.successMessage()
} catch(error) {
this.toastService.badRequest()
} finally {
loader.remove()
}
}
@@ -360,12 +369,16 @@ export class ExpedientePrPage implements OnInit {
}
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(otherbody).toPromise()
this.toastService.successMessage('Processo descartado');
this.goBack();
} catch (error) {
this.toastService.badRequest('Processo não descartado')
} finally {
loader.remove()
}
}
@@ -375,23 +388,34 @@ export class ExpedientePrPage implements OnInit {
}
else{
if(res['data']== 'Yes'){
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise();
this.toastService.successMessage('Processo descartado');
this.goBack();
} catch (error) {
this.toastService.badRequest('Processo não descartado')
} finally {
loader.remove()
}
this.goBack();
}
else if(res['data'] == 'No'){
console.log('Update');
const loader = this.toastService.loading()
try {
await this.processes.UpdateTaskStatus(this.task.FolderId).toPromise();
this.toastService.successMessage();
this.goBack();
} catch (error) {
this.toastService.badRequest()
} finally {
loader.remove()
}
}
}
src/app/pages/gabinete-digital/gabinete-digital.page.html
+1 -1
View File
@@ -21,7 +21,7 @@
</div>
<div class="aside overflow-y-auto d-flex flex-wrap width-100">
<div (click)="openEventsToApprovePage('MDGPR');selectedElement='approval'" [class.active]="selectedElement == 'approval'" class="exp-card d-flex flex-column" *ngIf="loggeduser.Profile == 'MDGPR'" >
<div (click)="openEventsToApprovePage();selectedElement='approval'" [class.active]="selectedElement == 'approval'" class="exp-card d-flex flex-column" *ngIf="loggeduser.Profile == 'MDGPR'" >
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-agenda.svg"></ion-icon>
</div>
src/app/pages/gabinete-digital/gabinete-digital.page.ts
-2
View File
@@ -10,8 +10,6 @@ import { PedidosPage } from './pedidos/pedidos.page';
/* import { PendentesPage } from './pendentes/pendentes.page'; */
import { AuthService } from 'src/app/services/auth.service';
import { User } from 'src/app/models/user.model';
import { DespachosPrPage } from 'src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page'
import { DiplomasPage } from 'src/app/shared/gabinete-digital/diplomas/diplomas.page';
import { ExpedientsPage } from 'src/app/shared/gabinete-digital/expedients/expedients.page';
import { PendentesPage } from 'src/app/shared/gabinete-digital/pendentes/pendentes.page';
import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page';
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+15
View File
@@ -199,6 +199,9 @@ export class PedidoPage implements OnInit {
},
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
@@ -206,6 +209,8 @@ export class PedidoPage implements OnInit {
this.close();
} catch (error) {
this.toastService.badRequest()
} finally {
loader.remove()
}
}
@@ -220,13 +225,18 @@ export class PedidoPage implements OnInit {
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.toastService.successMessage('Processo arquivado')
this.close();
} catch (error) {
this.toastService.badRequest()
} finally {
loader.remove()
}
}
async assignar(note:string, documents:any) {
@@ -240,13 +250,18 @@ export class PedidoPage implements OnInit {
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.toastService.successMessage('Processo arquivado')
this.close();
} catch (error) {
this.toastService.badRequest()
} finally {
loader.remove()
}
}
sendExpedienteToPending() {
src/app/pages/login/login.page.html
+1 -1
View File
@@ -75,7 +75,7 @@
Entrar com senha
</div>
<div class="voltar d-flex align-center justify-center pt-25 clear" (click)="clearCode()">
<div id="clear" class="cy-clear voltar d-flex align-center justify-center pt-25 clear" (click)="clearCode()">
Limpar
</div>
src/app/pages/publications/edit-action/edit-action.page.ts
+5 -1
View File
@@ -98,7 +98,8 @@ export class EditActionPage implements OnInit {
ActionType: this.folder.ActionType,
}
console.log(body);
const loader = this.toastService.loading()
try {
await this.publicationsService.UpdatePresidentialAction(body).toPromise()
this.close();
@@ -106,6 +107,9 @@ export class EditActionPage implements OnInit {
this.toastService.successMessage('Acção presidencial atualizada')
} catch (error) {
this.toastService.badRequest('Não foi possivel atualizar a acção presidencial')
} finally {
loader.remove()
}
}
}
src/app/pages/publications/new-action/new-action.page.ts
+4 -3
View File
@@ -136,20 +136,21 @@ export class NewActionPage implements OnInit {
}
let loader = this.toastService.loading()
const loader = this.toastService.loading()
try {
await this.publication.CreatePublicationFolder(this.folder).toPromise();
loader.remove()
this.toastService.successMessage("Ação presidencial criado");
this.close();
} catch (error) {
loader.remove()
this.toastService.badRequest("Ação presidencial não criado");
} finally {
loader.remove()
}
}
close(){
src/app/pages/publications/new-publication/new-publication.page.ts
+13
View File
@@ -164,6 +164,8 @@ export class NewPublicationPage implements OnInit {
FileExtension: 'jpeg',
}
const loader = this.toastService.loading()
try {
console.log(this.publication);
@@ -173,6 +175,8 @@ export class NewPublicationPage implements OnInit {
this.close();
} catch (error) {
this.toastService.badRequest("Publicação não criado")
} finally {
loader.remove()
}
}
@@ -190,6 +194,9 @@ export class NewPublicationPage implements OnInit {
}
/* console.log('Edit - keep image');
console.log(this.publication); */
const loader = this.toastService.loading()
try {
console.log(this.publication);
await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
@@ -198,6 +205,8 @@ export class NewPublicationPage implements OnInit {
this.close();
} catch (error) {
this.toastService.badRequest("Publicação não criado")
} finally {
loader.remove()
}
}
@@ -215,6 +224,8 @@ export class NewPublicationPage implements OnInit {
FileExtension: 'jpeg',
}
const loader = this.toastService.loading()
try {
console.log(this.publication);
await this.publications.CreatePublication(this.folderId, this.publication).toPromise();
@@ -225,6 +236,8 @@ export class NewPublicationPage implements OnInit {
this.close();
} catch (error) {
this.toastService.badRequest("Publicação não criado")
} finally {
loader.remove()
}
}
src/app/pages/publications/publication-detail/publication-detail.page.ts
+4
View File
@@ -83,12 +83,16 @@ export class PublicationDetailPage implements OnInit {
async deletePost(){
const loader = this.toastService.loading()
try {
await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise();
this.toastService.successMessage('Publicação eliminado')
this.close();
} catch (error) {
this.toastService.badRequest('Publicação não eliminado')
} finally {
loader.remove()
}
}
src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+4
View File
@@ -94,6 +94,8 @@ export class PublicationDetailPage implements OnInit {
async deletePost(){
const loader = this.toastService.loading()
try {
await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise();
this.toastService.successMessage('Publicaçao eliminado')
@@ -103,6 +105,8 @@ export class PublicationDetailPage implements OnInit {
} catch (error) {
this.toastService.badRequest('Publicaçao não eliminado')
} finally {
loader.remove()
}
}
src/app/services/toast.service.ts
+5 -1
View File
@@ -14,6 +14,10 @@ export class ToastService {
private modalController: ModalController,
) { }
ngOnInit() {
}
async presentToast(infoMessage: string) {
const toast = await this.toastController.create({
message: infoMessage,
@@ -132,7 +136,7 @@ export class ToastService {
<div class="loading-blocker">
<div class="loading-blocker-container">
<img src="/assets/images/Blocks-loader.gif" width="250" />
<img src="/assets/images/Blocks-loader.gif" />
</div>
</div>
`
src/app/shared/agenda/approve-event/approve-event.page.ts
+11
View File
@@ -81,12 +81,16 @@ export class ApproveEventPage implements OnInit {
async approveTask(serialNumber:string) {
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
const loader = this.toastService.loading()
try {
await this.processes.PostTaskAction(body).toPromise()
this.modalController.dismiss(serialNumber);
this.toastService.successMessage()
} catch (error) {
this.toastService.badRequest()
} finally {
loader.remove()
}
/* this.approveEventDismiss.emit({
@@ -105,12 +109,16 @@ export class ApproveEventPage implements OnInit {
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
console.log(body);
const loader = this.toastService.loading()
try {
await this.processes.PostTaskAction(body).toPromise()
this.router.navigate(['/home/gabinete-digital/event-list']);
this.toastService.successMessage('Evento rejeitado')
} catch (error) {
this.toastService.badRequest('Processo não efectuado')
} finally {
loader.remove()
}
}
@@ -165,6 +173,7 @@ export class ApproveEventPage implements OnInit {
}
}
console.log(body);
const loader = this.toastService.loading()
try {
await this.processes.PostTaskAction(body).toPromise();
@@ -172,6 +181,8 @@ export class ApproveEventPage implements OnInit {
this.close();
} catch (error) {
this.toastService.badRequest();
} finally {
loader.remove()
}
}
else{
src/app/shared/chat/messages/messages.page.ts
+10 -2
View File
@@ -4,6 +4,7 @@ import { Status } from 'src/app/models/chat/status.model';
import { AlertService } from 'src/app/services/alert.service';
import { AuthService } from 'src/app/services/auth.service';
import { ChatService } from 'src/app/services/chat.service';
import { ToastService } from 'src/app/services/toast.service';
import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page';
import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/messages-options.page';
import { ProfileComponent } from '../../headers/header-no-search/profile/profile.page';
@@ -37,6 +38,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
private authService: AuthService,
private animationController: AnimationController,
private alertService: AlertService,
private toastService: ToastService,
) {
/* this.dm = this.navParams.get('dm'); */
}
@@ -84,9 +86,15 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
console.log(this.roomId);
}
scrollToBottom(): void {
const loader = this.toastService.loading()
try {
this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
} catch(err) { }
this.myScrollContainer.nativeElement.scrollTop = this.myScrollContainer.nativeElement.scrollHeight;
} catch(err) { }
finally {
loader.remove()
}
}
loadMoreMessages(ev:any){
src/app/shared/popover/deploma-options/deploma-options.page.ts
+11
View File
@@ -95,13 +95,18 @@ export class DeplomaOptionsPage implements OnInit {
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
this.toastService.successMessage()
} catch (error) {
this.toastService.badRequest()
} finally {
loader.remove()
}
}
@@ -135,13 +140,19 @@ export class DeplomaOptionsPage implements OnInit {
},
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
this.toastService.successMessage()
} catch (error) {
this.toastService.badRequest()
} finally {
loader.remove()
}
}
src/app/shared/popover/despachos-options/despachos-options.page.ts
+20
View File
@@ -146,12 +146,16 @@ export class DespachosOptionsPage implements OnInit {
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.toastService.successMessage()
this.close();
} catch (error) {
this.toastService.badRequest()
} finally {
loader.remove()
}
}
@@ -220,13 +224,19 @@ export class DespachosOptionsPage implements OnInit {
},
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.toastService.successMessage('Processo arquivado')
this.close();
} catch (error) {
this.toastService.badRequest('Processo não arquivado')
} finally {
loader.remove()
}
}
@@ -242,13 +252,18 @@ export class DespachosOptionsPage implements OnInit {
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
this.toastService.successMessage()
} catch(error) {
this.toastService.badRequest()
} finally {
loader.remove()
}
}
@@ -263,12 +278,17 @@ export class DespachosOptionsPage implements OnInit {
},
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.toastService.successMessage()
this.close();
} catch (error) {
this.toastService.badRequest()
} finally {
loader.remove()
}
}
src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+19
View File
@@ -179,12 +179,16 @@ export class DespachosPrOptionsPage implements OnInit {
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.toastService.successMessage()
this.close();
} catch (error) {
this.toastService.badRequest()
} finally {
loader.remove()
}
}
@@ -255,12 +259,17 @@ export class DespachosPrOptionsPage implements OnInit {
},
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.toastService.successMessage('Processo arquivado')
this.close();
} catch (error) {
this.toastService.badRequest('Processo não arquivado')
} finally {
loader.remove()
}
}
@@ -277,13 +286,18 @@ export class DespachosPrOptionsPage implements OnInit {
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
this.toastService.successMessage()
} catch(error) {
this.toastService.badRequest()
} finally {
loader.remove()
}
}
@@ -297,12 +311,17 @@ export class DespachosPrOptionsPage implements OnInit {
},
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.toastService.successMessage()
this.close();
} catch (error) {
this.toastService.badRequest()
} finally {
loader.remove()
}
}
src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts
+21
View File
@@ -128,12 +128,16 @@ export class OptsExpedientePrPage implements OnInit {
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
this.toastService.successMessage()
} catch(error) {
this.toastService.badRequest()
} finally {
loader.remove()
}
}
@@ -162,12 +166,16 @@ export class OptsExpedientePrPage implements OnInit {
}
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(otherbody).toPromise()
this.toastService.successMessage('Processo descartado');
this.goBack();
} catch (error) {
this.toastService.badRequest('Processo não descartado')
} finally {
loader.remove()
}
}
@@ -177,23 +185,31 @@ export class OptsExpedientePrPage implements OnInit {
}
else{
if(res['data']== 'Yes'){
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise();
this.toastService.successMessage('Processo descartado');
this.goBack();
} catch (error) {
this.toastService.badRequest('Processo não descartado');
} finally {
loader.remove()
}
this.goBack();
}
else if(res['data'] == 'No'){
console.log('Update');
const loader = this.toastService.loading()
try {
await this.processes.UpdateTaskStatus(this.task.FolderId).toPromise();
this.toastService.successMessage();
this.goBack();
} catch (error) {
this.toastService.badRequest();
} finally {
loader.remove()
}
}
}
@@ -212,13 +228,18 @@ export class OptsExpedientePrPage implements OnInit {
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise();
this.close();
this.toastService.successMessage()
} catch(error) {
this.toastService.badRequest()
} finally {
loader.remove()
}
}
sendExpedienteToPending(){
src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+13
View File
@@ -187,13 +187,18 @@ export class OptsExpedientePage implements OnInit {
}
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(otherbody).toPromise()
this.toastService.successMessage('Processo descartado');
this.goBack();
} catch (error) {
this.toastService.badRequest('Processo não descartado')
} finally {
loader.remove()
}
}
else if(res['data'] == 'No'){
@@ -202,23 +207,31 @@ export class OptsExpedientePage implements OnInit {
}
else{
if(res['data']== 'Yes'){
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise();
this.toastService.successMessage('Processo descartado');
this.goBack();
} catch (error) {
this.toastService.badRequest('Processo não descartado')
} finally {
loader.remove()
}
this.goBack();
}
else if(res['data'] == 'No'){
console.log('Update');
const loader = this.toastService.loading()
try {
await this.processes.UpdateTaskStatus(this.task.FolderId).toPromise();
this.toastService.successMessage();
this.goBack();
} catch (error) {
this.toastService.badRequest()
} finally {
loader.remove()
}
}
}
src/app/shared/popover/request-options/request-options.page.ts
+5
View File
@@ -166,12 +166,17 @@ export class RequestOptionsPage implements OnInit {
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
this.toastService.successMessage()
} catch (error) {
this.toastService.badRequest()
}
finally {
loader.remove()
}
}
src/app/shared/publication/edit-action/edit-action.page.ts
+5
View File
@@ -96,6 +96,8 @@ export class EditActionPage implements OnInit {
}
console.log(body);
const loader = this.toastService.loading()
try {
await this.publicationsService.UpdatePresidentialAction(body).toPromise()
this.close();
@@ -103,6 +105,9 @@ export class EditActionPage implements OnInit {
this.toastService.successMessage('Acção presidencial atualizada')
} catch (error) {
this.toastService.badRequest('Não foi possivel atualizar a acção presidencial')
} finally {
loader.remove()
}
}
}
src/app/shared/publication/new-action/new-action.page.ts
+5
View File
@@ -110,13 +110,18 @@ export class NewActionPage implements OnInit {
}
console.log(this.folder);
const loader = this.toastService.loading()
try {
await this.publication.CreatePublicationFolder(this.folder).toPromise()
this.close();
this.toastService.successMessage('Acção presidencial criada')
} catch (error) {
this.toastService.badRequest('Não foi possivel criar a acção presidencial')
} finally {
loader.remove()
}
}
close(){
src/app/shared/publication/new-publication/new-publication.page.ts
+14 -11
View File
@@ -1,17 +1,10 @@
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
import { AlertController, AnimationController, ModalController, NavParams } from '@ionic/angular';
/* import {Plugins, CameraResultType, CameraSource} from '@capacitor/core'; */
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
import { AnimationController, ModalController } from '@ionic/angular';
import { SafeResourceUrl } from '@angular/platform-browser';
import { PublicationsService } from 'src/app/services/publications.service';
import { Publication } from 'src/app/models/publication';
import { Image } from 'src/app/models/image';
import { ThrowStmt } from '@angular/compiler';
import { PhotoService } from 'src/app/services/photo.service';
//Capacitor
/* const { Camera } = Plugins; */
//Cordova
import { Camera, CameraOptions } from '@ionic-native/camera/ngx';
import { ToastService } from 'src/app/services/toast.service';
import { FormControl, FormGroup, Validators } from '@angular/forms';
@@ -71,7 +64,7 @@ export class NewPublicationPage implements OnInit {
this.takePicture();
}
getPublicationDetail(){
getPublicationDetail() {
this.showLoader = true;
//console.log(this.publicationId);
/* console.log(this.folderId); */
@@ -177,6 +170,7 @@ export class NewPublicationPage implements OnInit {
}
console.log('Edit change image');
console.log(this.publication);
const loader = this.toastService.loading()
try {
console.log(this.publication);
@@ -187,6 +181,8 @@ export class NewPublicationPage implements OnInit {
this.goBack();
} catch (error) {
this.toastService.badRequest("Publicação não criado")
} finally {
loader.remove()
}
}
@@ -202,6 +198,7 @@ export class NewPublicationPage implements OnInit {
FileBase64: this.publication.FileBase64,
FileExtension: 'jpeg',
}
const loader = this.toastService.loading()
try {
console.log(this.publication);
@@ -211,11 +208,13 @@ export class NewPublicationPage implements OnInit {
this.goBack();
} catch (error) {
this.toastService.badRequest("Publicação não criado")
} finally {
loader.remove()
}
}
}
else{
else {
this.publication = {
DateIndex: new Date(),
@@ -229,6 +228,8 @@ export class NewPublicationPage implements OnInit {
FileExtension: 'jpeg',
}
const loader = this.toastService.loading()
try {
console.log(this.publication);
await this.publications.CreatePublication(this.folderId, this.publication).toPromise()
@@ -237,6 +238,8 @@ export class NewPublicationPage implements OnInit {
this.goBackToViewPublications.emit();
} catch (error) {
this.toastService.badRequest("Publicação não criado")
} finally {
loader.remove()
}
}
src/global.scss
+9
View File
@@ -1049,6 +1049,15 @@ ngx-mat-datetime-content{
background-color: #0000006b;
.loading-blocker-container {
width: 100px;
}
}
@media only screen and (min-width: 665px) {
.loading-blocker {
.loading-blocker-container {
width: 250px;
}
}
}
test/login.spec.ts
+90
View File
@@ -0,0 +1,90 @@
import { promise } from 'protractor';
import { environment } from './../src/environments/environment'
describe('Puppeteer tests', () => {
beforeAll(async () => {
// await page.goto(process.env.PUPPETEER_HOST)
})
test('[table] login', async () => {
// const browser = await puppeteer.launch({headless: false});
await page.setViewport({width: 1200, height: 720});
await page.goto(process.env.PUPPETEER_HOST); // wait until page load
await page.waitForSelector('.btn-ok')
await page.evaluate( () => {
let a: HTMLInputElement = document.querySelector('input[type="text"]')
a.value = ''
let b: HTMLInputElement = document.querySelector('input[type="password"')
b.value = ''
})
await page.type('input[type="text"]', environment.defaultuser);
await page.type('input[type="password"]', environment.defaultuserpwd);
// click and wait for navigation
await Promise.all([
page.click('.btn-ok'),
// page.waitForNavigation({ waitUntil: 'networkidle0' }),
]);
await page.waitForSelector('.circle')
expect(3 + 2).toBe(5);
},30000);
test('[table] Clear Code button and set pin', async () => {
// const browser = await puppeteer.launch({headless: false});
await page.setViewport({width: 1200, height: 720});
await page.goto(process.env.PUPPETEER_HOST); // wait until page load
await page.waitForSelector('.btn-ok')
await page.evaluate( () => {
let a: HTMLInputElement = document.querySelector('input[type="text"]')
a.value = ''
let b: HTMLInputElement = document.querySelector('input[type="password"')
b.value = ''
})
await page.type('input[type="text"]', environment.defaultuser);
await page.type('input[type="password"]', environment.defaultuserpwd);
// click and wait for navigation
await Promise.all([
page.click('.btn-ok'),
// page.waitForNavigation({ waitUntil: 'networkidle0' }),
]);
await page.waitForSelector('.circle')
// define code
await page.click('.circle')
await page.click('.circle')
await page.click('.circle')
// clear code
await page.click('.cy-clear')
// define code
await page.click('.circle')
await page.click('.circle')
await page.click('.circle')
await page.click('.circle')
await page.click('.div-profile')
expect(3 + 2).toBe(5);
},30000);
});
test/sdfasd.spec.ts
+18
View File
@@ -0,0 +1,18 @@
import { element } from 'protractor';
import { environment } from './../src/environments/environment'
describe('Puppeteer tests', () => {
beforeAll(async () => {
// await page.goto(process.env.PUPPETEER_HOST)
})
test('login', async () => {
expect(3 + 2).toBe(5);
}, 30000);
});
test/setupJest.ts
+7
View File
@@ -0,0 +1,7 @@
const ts_preset = require('ts-jest/presets/js-with-babel/jest-preset')
const puppeteer_preset = require('jest-puppeteer/jest-preset')
require('expect-puppeteer')
module.exports = async () => {
};
tsconfig.json
+2 -1
View File
@@ -19,5 +19,6 @@
"angularCompilerOptions": {
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true
}
},
"esModuleInterop": true
}
tsconfig.spec.json
+6 -2
View File
@@ -4,7 +4,10 @@
"outDir": "./out-tsc/spec",
"types": [
"jasmine",
"node"
"node",
"jest",
"puppeteer",
"jest-environment-puppeteer",
]
},
"files": [
@@ -14,5 +17,6 @@
"include": [
"src/**/*.spec.ts",
"src/**/*.d.ts"
]
],
"esModuleInterop": true
}