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

fix

Browse Source
This commit is contained in:
Peter Maquiran
2023-06-10 10:26:47 +01:00
parent 2f38104155
commit e57e48d9ce
5 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/new-event/new-event.page.ts
+2 -2
View File
@@ -45,8 +45,8 @@ export class NewEventPage implements OnInit {
// date picker
public date: any;
public disabled = false;
public showSpinners = true;
public showSeconds = false;
public showSpinners = false;
public showSeconds = true;
public touchUi = false;
public enableMeridian = false;
public stepHour = 1;
src/app/pages/agenda/view-event/view-event.page.html
+2
View File
@@ -5,6 +5,8 @@
</ion-refresher-content>
</ion-refresher>
{{ loadedEvent.HasAttachments | json}}
<div class="main-content d-flex height-100" [className]="isModal ? '_main-content d-flex height-100 ma-0 px-20 pt-30 pb-20 background-white' : 'main-content d-flex height-100'">
<div class="content d-flex flex-column width-100">
<div class="main-header d-flex">
src/app/pages/agenda/view-event/view-event.page.ts
+3 -1
View File
@@ -395,10 +395,12 @@ export class ViewEventPage implements OnInit {
setTimeout(() => {
/* this.loadEvent(); */
this.loadEvent()
this.getAttachments()
}, 250);
this.isEventEdited = true;
}
this.getAttachments()
});
}
src/app/pages/search/search.page.ts
+25 -12
View File
@@ -16,6 +16,7 @@ import { environment } from 'src/environments/environment';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
import { momentG } from 'src/plugin/momentG';
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
parse: {
@@ -319,11 +320,23 @@ export class SearchPage implements OnInit {
*/
basicSearch() {
if(this.type == "Agenda" ){
let searchDocumentDate
if (this.searchDocumentDate) {
searchDocumentDate = momentG(new Date(this.searchDocumentDate), 'yyyy-MM-dd')
}
searchDocumentDate;
if(this.searchSubject == '') {
this.searchSubject = undefined
}
if(this.type == "Agenda" ) {
this.showLoader = true;
this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '0').subscribe(res=>{
res.Categories.forEach( e => {
@@ -338,7 +351,7 @@ export class SearchPage implements OnInit {
this.reorderList(this.ordinance);
// hide show document
if(this.searchDocuments.length >= 1){
if(this.searchDocuments.length >= 1) {
this.showDocuments = true;
} else {
this.showDocuments = false
@@ -366,8 +379,8 @@ export class SearchPage implements OnInit {
let counter = 0;
this.search.searchForDoc(this.searchSubject, this.searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res => {
res.Categories.forEach( e => {
e['Active'] = false;
@@ -405,7 +418,7 @@ export class SearchPage implements OnInit {
}
});
this.search.searchForDoc(this.searchSubject, this.searchDocumentDate, this.searchSender
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res=>{
res.Categories.forEach( e => {
@@ -448,7 +461,7 @@ export class SearchPage implements OnInit {
} else {
let counter = 0;
this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res => {
res.Categories.forEach( e => {
e['Active'] = false;
@@ -488,7 +501,7 @@ export class SearchPage implements OnInit {
}
});
this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res => {
res.Categories.forEach( e => {
@@ -543,7 +556,7 @@ export class SearchPage implements OnInit {
let counter = 0;
this.search.searchForDoc(this.searchSubject, this.searchDocumentDate, this.searchSender
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{
res.Categories.forEach( e => {
@@ -581,7 +594,7 @@ export class SearchPage implements OnInit {
} else {
let counter = 0;
this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{
res.Categories.forEach( e => {
@@ -632,7 +645,7 @@ export class SearchPage implements OnInit {
this.searchCategories = []
this.searchDocuments = []
this.search.basicSearch(this.searchSubject, this.searchDocumentDate, this.searchSender
this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '386').subscribe(res=>{
@@ -683,7 +696,7 @@ export class SearchPage implements OnInit {
this.search.basicSearchPublication(this.searchSubject, this.searchDocumentDate, this.searchSender
this.search.basicSearchPublication(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '386').subscribe(res => {
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "7f3cfdc55",
"SHA": "7f3cfdc55eaf73f209eda70ac66421d005e406e2",
"shortSHA": "2f3810415",
"SHA": "2f38104155a4c697b74eb431a3ff564105c5cffc",
"branch": "feature/gabinete-search",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Fri Jun 9 12:02:11 2023 +0100'",
"lastCommitMessage": "fix loader",
"lastCommitNumber": "4957",
"lastCommitTime": "'Fri Jun 9 15:29:03 2023 +0100'",
"lastCommitMessage": "fix",
"lastCommitNumber": "4958",
"change": "",
"changeStatus": "On branch feature/gabinete-search\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/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/view-event/view-event.page.ts\n\tmodified: src/app/pages/events/attendees/attendees.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/services/http-error-handle.service.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.html",
"changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/agenda/view-event/view-event.page.ts\n\tmodified: src/app/pages/search/search.page.ts",
"changeAuthor": "peter.maquiran"
}