diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts index 8ed7fd819..176f8aa43 100644 --- a/src/app/models/beast-orm.ts +++ b/src/app/models/beast-orm.ts @@ -48,12 +48,6 @@ models.register({ }) -window['MessageModel'] = MessageModel - - - - - export class ActionModel extends models.Model{ ProcessId = models.IntegerField({unique: true}) Description = models.CharField() diff --git a/src/app/pages/search/search.page.scss b/src/app/pages/search/search.page.scss index bac058200..6a0ea05b6 100644 --- a/src/app/pages/search/search.page.scss +++ b/src/app/pages/search/search.page.scss @@ -69,6 +69,7 @@ ion-slide{ // search result type .options{ + max-width: 900px; margin-top: 10px; .container{ .d-flex{ diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 53281b4fd..18fd87fb3 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -328,8 +328,8 @@ export class SearchPage implements OnInit { searchDocumentDate; - if(this.searchSubject == '') { - this.searchSubject = undefined + if(this.searchSubject == undefined || this.searchSubject == null) { + this.searchSubject = "" } if(this.type == "Agenda" ) { diff --git a/src/assets/app.module.ts b/src/assets/app.module.ts new file mode 100644 index 000000000..fb4d80952 --- /dev/null +++ b/src/assets/app.module.ts @@ -0,0 +1,207 @@ +import { NgModule, CUSTOM_ELEMENTS_SCHEMA, ErrorHandler } from '@angular/core'; +import { BrowserModule, HammerModule } from '@angular/platform-browser'; +import { RouteReuseStrategy } from '@angular/router'; + +import { IonicModule, IonicRouteStrategy } from '@ionic/angular'; +// import { SplashScreen } from '@ionic-native/splash-screen/ngx'; +import { StatusBar } from '@ionic-native/status-bar/ngx'; + +import { AppRoutingModule } from '../app/app-routing.module'; +import { AppComponent } from '../app/app.component'; +import { HttpClientModule } from '@angular/common/http'; + +import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; + +//import { File } from '@ionic-native/File/ngx'; +import { WebView } from '@ionic-native/ionic-webview/ngx'; +import { FilePath } from '@ionic-native/file-path/ngx'; +import { Camera } from '@ionic-native/camera/ngx'; +import { IonicStorageModule } from '@ionic/storage'; + +import { CommonModule } from '@angular/common'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; + +import { CalendarModule, DateAdapter } from 'angular-calendar'; +import { adapterFactory } from 'angular-calendar/date-adapters/date-fns'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { ChatService } from '../app/services/chat.service'; +import {MatDatepickerModule} from '@angular/material/datepicker'; +// import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx'; +import {MAT_DATE_LOCALE} from '@angular/material/core'; +import { Network } from '@ionic-native/network/ngx'; +import { MultipleDocumentsPicker } from '@awesome-cordova-plugins/multiple-document-picker/ngx'; +import { DocumentViewer } from '@awesome-cordova-plugins/document-viewer/ngx'; + + + +import { + NgxMatDatetimePickerModule, + NgxMatNativeDateModule, + NgxMatTimepickerModule +} from '@angular-material-components/datetime-picker'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatSelectModule } from '@angular/material/select'; +import { NgxMatMomentModule } from '@angular-material-components/moment-adapter'; +import { MatButtonModule } from '@angular/material/button'; +import { HttpClient } from '@angular/common/http'; + +import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontawesome'; +import { fas } from '@fortawesome/free-solid-svg-icons' +import { far } from '@fortawesome/free-regular-svg-icons' +import { fab } from '@fortawesome/free-brands-svg-icons' + +import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx'; +import { SQLite } from '@ionic-native/sqlite/ngx'; +import { CookieService } from 'ngx-cookie-service'; + +import { ImagePicker } from '@ionic-native/image-picker/ngx'; +import { MediaCapture } from '@ionic-native/media-capture/ngx'; +import { Media } from '@ionic-native/media/ngx'; +import { File } from '@awesome-cordova-plugins/file/ngx'; + +import { StreamingMedia } from '@ionic-native/streaming-media/ngx'; +import { PhotoViewer } from '@ionic-native/photo-viewer/ngx'; +import {NgxImageCompressService} from 'ngx-image-compress'; +import { CustomImageCachePageRoutingModule } from '../app/services/file/custom-image-cache/custom-image-cache-routing.module'; +import { IonicImageLoaderComponent, IonicImageLoaderModule } from 'ionic-image-loader-v5'; +import { NgxExtendedPdfViewerModule } from 'ngx-extended-pdf-viewer'; +import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx'; + + +import { MatInputModule } from '@angular/material/input'; +import { MatNativeDateModule } from '@angular/material/core'; + + + +// The example is using Angular, Import '@sentry/vue' or '@sentry/react' when using a Sibling different than Angular. + import * as SentrySibling from '@sentry/angular'; +import * as Sentry from '@sentry/capacitor'; +// The e xample is using Angular, Import '@sentry/vue' or '@sentry/react' when using a Sibling different than Angular. +// For automatic instrumentation (highly recommended) +import { Integration } from '@sentry/types'; +import { BrowserTracing } from '@sentry/tracing'; + +// import { ServiceWorkerModule } from '@angular/service-worker'; +// import { AngularFireModule } from '@angular/fire'; +// import { AngularFireMessagingModule } from '@angular/fire/messaging'; +// import { environment } from 'src/environments/environment'; + +/* import { FCM } from '@ionic-native/fcm/ngx'; +import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */ +//import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx'; + + Sentry.init( + { + dsn: 'https://5b345a3ae70b4e4da463da65881b4aaa@o4504340905525248.ingest.sentry.io/4504345615794176', + // To set your release and dist versions + release: 'gabinetedigital@1.0.0', + dist: '1', + // Set tracesSampleRate to 1.0 to capture 100% of transactions for performance monitoring. + // We recommend adjusting this value in production. + tracesSampleRate: 1.0, + integrations: [ + new BrowserTracing({ + tracingOrigins: ['localhost', 'https://gd-api.oapr.gov.ao/api/'], + }) as Integration, + ] + }, + // Forward the init method to the sibling Framework. + SentrySibling.init +); +@NgModule({ + declarations: [AppComponent], + entryComponents: [], + imports: [BrowserModule, + CommonModule, + FormsModule, + CalendarModule.forRoot({ + provide: DateAdapter, + useFactory: adapterFactory + }), + //AngularFireModule.initializeApp(environment.firebase), + //AngularFireMessagingModule, + IonicImageLoaderModule, + IonicModule.forRoot({animated: false}), + IonicStorageModule.forRoot({ + name: '__mydb', + driverOrder: ['indexeddb', 'sqlite', 'websql'] + + }), + + AppRoutingModule, + FontAwesomeModule, + HttpClientModule, + // NgbModule, + NoopAnimationsModule, + MatDatepickerModule, + + // + NgxMatDatetimePickerModule, + NgxMatTimepickerModule, + NgxMatNativeDateModule, + + NgxMatMomentModule, + MatButtonModule, + ReactiveFormsModule, + + MatSelectModule, + MatDialogModule, + // + HammerModule, + CustomImageCachePageRoutingModule, + + // + MatInputModule, + MatNativeDateModule, + NgxMatDatetimePickerModule, + NgxMatTimepickerModule, + NgxMatNativeDateModule, + NgxMatMomentModule, + MatSelectModule, + MatButtonModule, + + ], + providers: [ + { provide: MAT_DATE_LOCALE, useValue: 'pt' }, + { + provide: ErrorHandler, + // Attach the Sentry ErrorHandler + useValue: SentrySibling.createErrorHandler(), + }, + StatusBar, + //SplashScreen, + HttpClient, + HttpClientModule, + { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, + InAppBrowser, + Camera, + File, + WebView, + FilePath, + /* FCM, + FirebaseX, */ + ChatService, + ScreenOrientation, + Network, + SQLite, + CookieService, + ImagePicker, + MediaCapture, + Media, + StreamingMedia, + PhotoViewer, + NgxImageCompressService, + MultipleDocumentsPicker, + NgxExtendedPdfViewerModule, + FileOpener, + DocumentViewer + + ], + bootstrap: [AppComponent], + schemas: [CUSTOM_ELEMENTS_SCHEMA] +}) +export class AppModule { + constructor(library: FaIconLibrary) { + library.addIconPacks(fas, fab, far); + } +} diff --git a/version/git-version.ts b/version/git-version.ts index d120aadb3..ce3c56957 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "2f3810415", - "SHA": "2f38104155a4c697b74eb431a3ff564105c5cffc", + "shortSHA": "e57e48d9c", + "SHA": "e57e48d9ce538cbaca45e8b38f19ff7d520b4462", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Jun 9 15:29:03 2023 +0100'", + "lastCommitTime": "'Sat Jun 10 10:26:47 2023 +0100'", "lastCommitMessage": "fix", - "lastCommitNumber": "4958", + "lastCommitNumber": "4959", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" 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", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/pages/search/search.page.scss\n\tmodified: src/app/pages/search/search.page.ts\n\tnew file: src/assets/app.module.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file