mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 13:02:56 +00:00
Improve
This commit is contained in:
@@ -3,7 +3,7 @@ import { AnimationController, ModalController, NavParams } from '@ionic/angular'
|
||||
import { EventAttachment } from 'src/app/models/attachment.model';
|
||||
import { EventBody } from 'src/app/models/eventbody.model';
|
||||
import { EventPerson } from 'src/app/models/eventperson.model';
|
||||
import { SearchDocument } from 'src/app/models/search-document';
|
||||
import { SearchList } from 'src/app/models/search-document';
|
||||
import { User } from 'src/app/models/user.model';
|
||||
import { AttachmentsService } from 'src/app/services/attachments.service';
|
||||
import { AuthService } from 'src/app/services/auth.service';
|
||||
@@ -56,7 +56,7 @@ export class NewEventPage implements OnInit {
|
||||
taskParticipants: any = [];
|
||||
taskParticipantsCc: any = [];
|
||||
|
||||
documents:SearchDocument[] = [];
|
||||
documents:SearchList[] = [];
|
||||
|
||||
loggeduser: User;
|
||||
members:any;
|
||||
|
||||
+2
-2
@@ -9,7 +9,7 @@ import { EventsService } from 'src/app/services/events.service';
|
||||
import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
|
||||
import { AttachmentsService } from 'src/app/services/attachments.service';
|
||||
import { SearchPage } from 'src/app/pages/search/search.page';
|
||||
import { SearchDocument } from 'src/app/models/search-document';
|
||||
import { SearchList } from 'src/app/models/search-document';
|
||||
import { User } from 'src/app/models/user.model';
|
||||
import { AuthService } from 'src/app/services/auth.service';
|
||||
import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
|
||||
@@ -102,7 +102,7 @@ export class BookMeetingModalPage implements OnInit {
|
||||
|
||||
taskDocId:string;
|
||||
loadedAttachments:any;
|
||||
documents:SearchDocument[] = [];
|
||||
documents:SearchList[] = [];
|
||||
|
||||
adding: "intervenient" | "CC" = "intervenient";
|
||||
|
||||
|
||||
+2
-2
@@ -12,7 +12,7 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
|
||||
import { ExpedienteDetailPage } from '../expediente-detail/expediente-detail.page';
|
||||
import { AlertService } from 'src/app/services/alert.service';
|
||||
import { SearchPage } from 'src/app/pages/search/search.page';
|
||||
import { SearchDocument } from 'src/app/models/search-document';
|
||||
import { SearchList } from 'src/app/models/search-document';
|
||||
import { User } from 'src/app/models/user.model';
|
||||
import { ToastService } from 'src/app/services/toast.service';
|
||||
import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
|
||||
@@ -62,7 +62,7 @@ export class ExpedientTaskModalPage implements OnInit {
|
||||
taskDescription: string;
|
||||
|
||||
loadedAttachments:any;
|
||||
documents:SearchDocument[] = [];
|
||||
documents:SearchList[] = [];
|
||||
|
||||
subjectTypes:any[] = [];
|
||||
selectedTypes: string[]=[];
|
||||
|
||||
+2
-2
@@ -15,7 +15,7 @@ import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-
|
||||
import { ToastService } from 'src/app/services/toast.service';
|
||||
import { Location } from '@angular/common';
|
||||
import { SearchPage } from 'src/app/pages/search/search.page';
|
||||
import { SearchDocument } from 'src/app/models/search-document';
|
||||
import { SearchList } from 'src/app/models/search-document';
|
||||
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
|
||||
import { PermissionService } from 'src/app/OtherService/permission.service';
|
||||
import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe';
|
||||
@@ -42,7 +42,7 @@ export class ExpedienteDetailPage implements OnInit {
|
||||
profile: string;
|
||||
intervenientes: any;
|
||||
cc: any = [];
|
||||
documents:SearchDocument[] = [];
|
||||
documents:SearchList[] = [];
|
||||
attachments:any;
|
||||
|
||||
hideSendToPendentes = true
|
||||
|
||||
@@ -16,7 +16,7 @@ import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
|
||||
import { OptsExpedientePrPage } from 'src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page';
|
||||
import { ToastService } from 'src/app/services/toast.service';
|
||||
import { SearchPage } from 'src/app/pages/search/search.page';
|
||||
import { SearchDocument } from 'src/app/models/search-document';
|
||||
import { SearchList } from 'src/app/models/search-document';
|
||||
import { Location } from '@angular/common';
|
||||
import { AttachmentList } from 'src/app/models/Excludetask';
|
||||
|
||||
@@ -41,7 +41,7 @@ export class ExpedientePrPage implements OnInit {
|
||||
cc: any = [];
|
||||
|
||||
loggeduser: User;
|
||||
documents:SearchDocument[] = [];
|
||||
documents: SearchList[] = [];
|
||||
attachments:any;
|
||||
|
||||
constructor(
|
||||
@@ -341,7 +341,7 @@ export class ExpedientePrPage implements OnInit {
|
||||
modal.onDidDismiss().then(res => {
|
||||
console.log(res);
|
||||
if(res.data){
|
||||
const DocumentToSave = res.data.documents.map((e:SearchDocument) => {
|
||||
const DocumentToSave = res.data.documents.map((e:SearchList) => {
|
||||
return {
|
||||
ApplicationId: e.ApplicationType,
|
||||
SourceId: e.Id,
|
||||
|
||||
@@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core';
|
||||
import { ModalController, NavParams } from '@ionic/angular';
|
||||
import { SearchService } from "../../services/search.service";
|
||||
import { SearchCategory } from "src/app/models/search-category";
|
||||
import { SearchDocument } from "src/app/models/search-document";
|
||||
import { formatDate } from '@angular/common';
|
||||
import { SenderPage } from 'src/app/pages/search/sender/sender.page';
|
||||
import { OrganicEntityPage } from 'src/app/pages/search/organic-entity/organic-entity.page';
|
||||
@@ -10,6 +9,7 @@ import WordCloud from 'src/plugin/wordcloud2.js';
|
||||
import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
|
||||
import { PublicationDetailPage } from '../publications/view-publications/publication-detail/publication-detail.page';
|
||||
import { DocumentDetailPage } from 'src/app/modals/document-detail/document-detail.page';
|
||||
import { SearchList } from 'src/app/models/search-document';
|
||||
|
||||
@Component({
|
||||
selector: 'app-search',
|
||||
@@ -27,9 +27,9 @@ export class SearchPage implements OnInit {
|
||||
ordinance: string;
|
||||
|
||||
searchCategories: SearchCategory[] = [];
|
||||
showSearchDocuments: SearchDocument[] = [];
|
||||
showSearchDocuments: SearchList[] = [];
|
||||
showCategory: string;
|
||||
searchDocuments: SearchDocument[] =[];
|
||||
searchDocuments: SearchList[] =[];
|
||||
|
||||
showDocuments = false;
|
||||
showAdvanceSearch = false;
|
||||
@@ -85,7 +85,7 @@ export class SearchPage implements OnInit {
|
||||
}
|
||||
}
|
||||
|
||||
selectItem(item: SearchDocument) {
|
||||
selectItem(item: SearchList) {
|
||||
if(this.select){
|
||||
this.modalController.dismiss({
|
||||
selected: item
|
||||
@@ -552,7 +552,7 @@ export class SearchPage implements OnInit {
|
||||
}
|
||||
|
||||
|
||||
async viewDetail(searchDocument: SearchDocument) {
|
||||
async viewDetail(searchDocument: SearchList) {
|
||||
|
||||
const ApplicationType = searchDocument.ApplicationType.toString()
|
||||
const Id = searchDocument.Id
|
||||
|
||||
Reference in New Issue
Block a user