mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
merge
This commit is contained in:
@@ -223,7 +223,7 @@ export class EditEventPage implements OnInit {
|
|||||||
participantes: new FormControl(this.taskParticipants, [
|
participantes: new FormControl(this.taskParticipants, [
|
||||||
// Validators.required
|
// Validators.required
|
||||||
]),
|
]),
|
||||||
Date: new FormControl( new Date(this._postEvent.StartDate).toLocaleString('pt') < new Date(this._postEvent.EndDate).toLocaleString('pt')? 'ok': null,[
|
Date: new FormControl( true,[
|
||||||
Validators.required
|
Validators.required
|
||||||
]),
|
]),
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<div class="flex-grow-1">Eventos para Aprovação</div>
|
<div class="flex-grow-1">Eventos para Aprovação</div>
|
||||||
<div (click)="refreshing()">
|
<div (click)="refreshing()">
|
||||||
<button title="Atualizar" class="btn-no-color" >
|
<button title="Atualizar" class="btn-no-color" >
|
||||||
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
|
<ion-icon class=" font-45-em" src="assets/images/theme/gov/icon-reload.svg"></ion-icon>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
export let versionData = {
|
export let versionData = {
|
||||||
"shortSHA": "f472d5ac0",
|
"shortSHA": "64e463ab6",
|
||||||
"SHA": "f472d5ac0b3819bb8239a0b3512a53eff32df19b",
|
"SHA": "64e463ab6f5bb8852b42054e895dbdc45dff457e",
|
||||||
"branch": "developer-prod",
|
"branch": "developer-prod",
|
||||||
"lastCommitAuthor": "'Peter Maquiran'",
|
"lastCommitAuthor": "'Peter Maquiran'",
|
||||||
"lastCommitTime": "'Wed Aug 30 17:14:59 2023 +0100'",
|
"lastCommitTime": "'Wed Aug 30 17:53:02 2023 +0100'",
|
||||||
"lastCommitMessage": "merge",
|
"lastCommitMessage": "icons changes",
|
||||||
"lastCommitNumber": "5244",
|
"lastCommitNumber": "5245",
|
||||||
"change": "",
|
"change": "diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts\nindex e1ee282ff..fc644bfbc 100644\n--- a/src/app/modals/create-process/create-process.page.ts\n+++ b/src/app/modals/create-process/create-process.page.ts\n@@ -105,6 +105,12 @@ export class CreateProcessPage implements OnInit {\n this.task = this.navParams.get('task');\n this.fulltask = this.navParams.get('fulltask');\n \n+\n+ console.log('this.fulltask', this.fulltask)\n+\n+\n+ this.documents = this.fulltask.Documents\n+\n if (this.task.SerialNumber) {\n this.task.serialNumber = this.task.SerialNumber\n }",
|
||||||
"changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: workspace.code-workspace",
|
"changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.html\n\nChanges not staged for commit:\n (use \"git add <file>...\" to update what will be committed)\n (use \"git restore <file>...\" to discard changes in working directory)\n\tmodified: src/app/modals/create-process/create-process.page.ts",
|
||||||
"changeAuthor": "peter.maquiran"
|
"changeAuthor": "peter.maquiran"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user