Refactoring

Author: Allan Asp Christensen

package-lock.json

@@ -38,6 +38,7 @@
     "guid-typescript": "^1.0.9",
     "jwt-decode": "^2.2.0",
     "moment": "^2.27.0",
+    "ngx-papaparse": "^5.0.0",
     "popper.js": "^1.16.0",
     "rxjs": "~6.5.4",
     "tslib": "^1.10.0",

package.json

@@ -58,7 +58,7 @@ <h4 class="">
         {{ 'ORGANISATION.DETAIL.APPLICATIONS' | translate }}
     </h4>
 
-    <app-applications-table [applications]="applications" (deleteApplication)="deleteApplication($event)">
-    </app-applications-table>
+    <!-- <app-applications-table [applications]="applications" (deleteApplication)="deleteApplication($event)">
+    </app-applications-table> -->
 
 </div>

src/app/admin/organisation/organisation-detail/organisation-detail.component.html

@@ -1,14 +1,13 @@
 import { Component, OnInit } from '@angular/core';
 
 import { ActivatedRoute } from '@angular/router';
-import { BackButton } from '@app/models/back-button';
-import { QuickActionButton } from '@app/models/quick-action-button';
 import { TranslateService } from '@ngx-translate/core';
 import { Subscription } from 'rxjs';
-import { Application } from '@app/models/application';
-import { ApplicationService } from '@shared/services/application.service';
-import { OrganisationService } from '@shared/services/organisation.service';
+import { Application } from '@applications/application.model';
+import { ApplicationService } from '@applications/application.service';
+import { OrganisationService } from '@app/admin/organisation/organisation.service';
 import { OrganisationResponse } from '../organisation.model';
+import { BackButton } from '@shared/models/back-button.model';
 
 @Component({
   selector: 'app-organisation-detail',

src/app/admin/organisation/organisation-detail/organisation-detail.component.ts

@@ -1,14 +1,13 @@
 import { Component, OnInit } from '@angular/core';
-
-import { OrganisationService } from 'src/app/shared/services/organisation.service';
+import { OrganisationService } from '@app/admin/organisation/organisation.service';
 import { HttpErrorResponse } from '@angular/common/http';
 import { FormGroup } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
-import { BackButton } from '@app/models/back-button';
 import { TranslateService } from '@ngx-translate/core';
 import { Subscription } from 'rxjs';
 import { Location } from '@angular/common';
 import { Organisation } from '../organisation.model';
+import { BackButton } from '@shared/models/back-button.model';
 
 @Component({
   selector: 'app-organisation-edit',

src/app/admin/organisation/organisation-edit/organisation-edit.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { Sort } from '@app/models/sort';
 import { TranslateService } from '@ngx-translate/core';
+import { Sort } from '@shared/models/sort.model';
 
 @Component({
   selector: 'app-organisation-list',
@@ -59,7 +59,7 @@ export class OrganisationListComponent implements OnInit {
     translate.use('da');
   }
 
-  ngOnInit(): void {}
+  ngOnInit(): void { }
 
   updatePageLimit(limit: any) {
     console.log(limit);

src/app/admin/organisation/organisation-list/organisation-list.component.ts

@@ -1,6 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Sort } from '@app/models/sort';
-import { OrganisationService } from '@shared/services/organisation.service';
+import { Sort } from '@shared/models/sort.model';
+import { OrganisationService } from '@app/admin/organisation/organisation.service';
 import { Subscription } from 'rxjs';
 import { OrganisationResponse } from '../../organisation.model';
 

src/app/admin/organisation/organisation-list/organisation-tabel/organisation-tabel.component.ts

@@ -1,5 +1,5 @@
 import { PayloadDecoder } from '../../payload-decoder/payload-decoder.model';
-import { Application } from '../../models/application';
+import { Application } from '../../applications/application.model';
 
 export class Organisation {
   id?: number;

src/app/admin/organisation/organisation.model.ts

@@ -1,10 +1,10 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MyApplicationsModule } from '@my-applications/my-applications.module';
+import { ApplicationsModule } from '@app/applications/applications.module';
 import { TranslateModule } from '@ngx-translate/core';
-import { FormModule } from '@shared/form/form.module';
-import { TopBarModule } from '@shared/top-bar/top-bar.module';
+import { FormModule } from '@shared/components/forms/form.module';
+import { TopBarModule } from '@shared/components/top-bar/top-bar.module';
 import { OrganisationDetailComponent } from './organisation-detail/organisation-detail.component';
 import { OrganisationEditComponent } from './organisation-edit/organisation-edit.component';
 import { OrganisationListComponent } from './organisation-list/organisation-list.component';
@@ -29,7 +29,7 @@ import { OrganisationComponent } from './organisation.component';
     TopBarModule,
     ReactiveFormsModule,
     FormModule,
-    MyApplicationsModule,
+    ApplicationsModule,
   ],
 })
 export class OrganisationModule { }

src/app/admin/organisation/organisation.module.ts

@@ -1,19 +1,19 @@
 import { Injectable } from '@angular/core';
-import { RestService } from './rest.service';
+import { RestService } from '../../shared/services/rest.service';
 import { Observable } from 'rxjs';
 import {
   Organisation,
   OrganisationResponse,
   OrganisationGetManyResponse,
-} from '../../admin/organisation/organisation.model';
+} from './organisation.model';
 
 @Injectable({
   providedIn: 'root',
 })
 export class OrganisationService {
   URL = 'organization';
 
-  constructor(private restService: RestService) {}
+  constructor(private restService: RestService) { }
 
   post(body: Organisation): Observable<OrganisationResponse> {
     return this.restService.post(this.URL, body);