From 923a141ffab6f4b1d3c0a1687b2e41ac7dd04a3b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Sat, 10 Jun 2023 21:14:50 +0100 Subject: [PATCH] remove --- src/app/models/beast-orm.ts | 60 +++++------ src/assets/app.module.ts | 207 ------------------------------------ version/git-version.ts | 12 +-- 3 files changed, 36 insertions(+), 243 deletions(-) delete mode 100644 src/assets/app.module.ts diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts index 421c75754..ae03945ea 100644 --- a/src/app/models/beast-orm.ts +++ b/src/app/models/beast-orm.ts @@ -1,7 +1,7 @@ import { models } from 'beast-orm' /* import { models } from 'src/plugin/src' */ import { environment } from 'src/environments/environment' -import { DispatchDomain } from 'src/app/domain/process/DispatchDomain' +// import { DispatchDomain } from 'src/app/domain/process/DispatchDomain' const { ArrayField, JsonField} = models.indexedDB.fields export class MessageModel extends models.Model { @@ -80,34 +80,34 @@ models.register({ // gabinete -export class DispatchModal extends models.Model{ - SerialNumber = models.CharField() - TaskStartDate = models.CharField() - Subject = models.CharField() - Folio = models.CharField() - Senders = models.CharField() - CreateDate = models.CharField() - DocumentsQty = models.IntegerField() - WorkflowName = models.CharField() - activityInstanceName = models.CharField() - Status = models.CharField() - Deadline = models.CharField() - TaskStatus = models.CharField() - TaskReceiveDate = models.CharField() +// export class DispatchModal extends models.Model{ +// SerialNumber = models.CharField() +// TaskStartDate = models.CharField() +// Subject = models.CharField() +// Folio = models.CharField() +// Senders = models.CharField() +// CreateDate = models.CharField() +// DocumentsQty = models.IntegerField() +// WorkflowName = models.CharField() +// activityInstanceName = models.CharField() +// Status = models.CharField() +// Deadline = models.CharField() +// TaskStatus = models.CharField() +// TaskReceiveDate = models.CharField() - // Busses logic - arquivar = DispatchDomain.arquivar - executado = DispatchDomain.executado - reexecutar = DispatchDomain.reexecutar - sendToPending = DispatchDomain.sendToPending - requestAppear = DispatchDomain.requestAppear - createTaskDispatch = DispatchDomain.createTaskDispatch - setUpMeeting = DispatchDomain.setUpMeeting -} +// // Busses logic +// arquivar = DispatchDomain.arquivar +// executado = DispatchDomain.executado +// reexecutar = DispatchDomain.reexecutar +// sendToPending = DispatchDomain.sendToPending +// requestAppear = DispatchDomain.requestAppear +// createTaskDispatch = DispatchDomain.createTaskDispatch +// setUpMeeting = DispatchDomain.setUpMeeting +// } -models.register({ - databaseName: 'cabinet'+environment.version.lastCommitNumber + environment.id, - type: 'indexedDB', - version: 14, - models: [DispatchModal] -}) +// models.register({ +// databaseName: 'cabinet'+environment.version.lastCommitNumber + environment.id, +// type: 'indexedDB', +// version: 14, +// models: [DispatchModal] +// }) diff --git a/src/assets/app.module.ts b/src/assets/app.module.ts deleted file mode 100644 index fb4d80952..000000000 --- a/src/assets/app.module.ts +++ /dev/null @@ -1,207 +0,0 @@ -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 020187058..f817b9bd1 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "7eac0a768", - "SHA": "7eac0a7680f176287d200eb0d3ee0c7a80a32380", + "shortSHA": "8c34d2d7c", + "SHA": "8c34d2d7cf245c39cca00837e1bb5cd907d26f9b", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Sat Jun 10 17:49:13 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "4966", + "lastCommitTime": "'Sat Jun 10 20:17:51 2023 +0100'", + "lastCommitMessage": "remove error", + "lastCommitNumber": "4967", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/popover/despachos-options/despachos-options.page.html\n\tmodified: src/app/shared/popover/despachos-options/despachos-options.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\tdeleted: src/assets/app.module.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file