philorg/gisaf-frontend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fix/update admin (WIP)

Browse source
This commit is contained in:
phil 2024-03-25 17:21:39 +05:30
parent 4994d8314a
commit 339d8f2210
11 changed files with 49 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/app/admin/admin-basket/admin-basket-resolver.service.ts
View file

@ -3,7 +3,8 @@ import { Router, RouterStateSnapshot, ActivatedRouteSnapshot } from '@angular/ro
import { Observable, forkJoin } from 'rxjs'
import { map } from 'rxjs/operators'
import { AdminBasket, AdminBasketDataService } from './data.service'
import { AdminBasketDataService } from './data.service'
import { AdminBasket } from '../../openapi'
@Injectable()
export class BasketResolver {

17
src/app/admin/admin-basket/admin-basket-upload/basket-upload.component.ts
View file

@ -6,7 +6,8 @@ import { UntypedFormGroup, UntypedFormControl, Validators } from '@angular/forms
import { MatTableDataSource } from '@angular/material/table'
import { AdminDataService } from '../../admin-data.service'
import { AdminBasketFile, AdminBasket } from '../data.service'
import { AdminBasketFile } from '../data.service'
import { AdminBasket } from '../../../openapi'
import { MatSnackBar } from '@angular/material/snack-bar'
import { HtmlSnackbarComponent } from '../../../custom-snackbar/custom-snackbar.component'
@ -33,14 +34,14 @@ export class AdminBasketUploadComponent implements OnInit, OnChanges {
formGroup: UntypedFormGroup = new UntypedFormGroup({})
ngOnInit() {
let defaults = this.adminDataService.surveyMeta.defaults
let dflt = this.adminDataService.surveyMeta.default
this.formGroup = new UntypedFormGroup({
'store_misc': new UntypedFormControl(defaults['store_misc'], [Validators.required]),
'store_line_work': new UntypedFormControl(defaults['store_line_work'], [Validators.required]),
'status': new UntypedFormControl(defaults['status'], [Validators.required]),
'project': new UntypedFormControl(defaults['project'], [Validators.required]),
'surveyor': new UntypedFormControl(defaults['surveyor'], [Validators.required]),
'equipment': new UntypedFormControl(defaults['equipment'], [Validators.required]),
'store_misc': new UntypedFormControl(dflt['store_misc'], [Validators.required]),
'store_line_work': new UntypedFormControl(dflt['store_line_work'], [Validators.required]),
'status': new UntypedFormControl(dflt.status, [Validators.required]),
'project': new UntypedFormControl(dflt.project, [Validators.required]),
'surveyor': new UntypedFormControl(dflt.surveyor, [Validators.required]),
'equipment': new UntypedFormControl(dflt.equipment, [Validators.required]),
'autoImport': new UntypedFormControl(true),
})
this.setupRequired()

5
src/app/admin/admin-basket/basket.component.ts
View file

@ -10,7 +10,8 @@ import { MatSort } from '@angular/material/sort'
import { MatTableDataSource } from '@angular/material/table'
import { AdminDataService } from '../admin-data.service'
import { AdminBasketDataService, AdminBasket, AdminBasketFile } from './data.service'
import { AdminBasketDataService, AdminBasketFile } from './data.service'
import { AdminBasket } from '../../openapi'
import { HtmlSnackbarComponent } from '../../custom-snackbar/custom-snackbar.component'
@Component({
@ -79,7 +80,7 @@ export class AdminBasketComponent implements OnInit {
importItem(item: AdminBasketFile, dryRun: boolean) {
this.adminBasketDataService.importItem(this.basket.name, item.id, dryRun).subscribe(
resp => {
this.basket.files.find(row => row.id == item.id).time = new Date(resp.time)
this.basket.files.find(row => row.id == item.id).time = new Date(resp.time).toLocaleString()
this.snackBar.openFromComponent(HtmlSnackbarComponent, {
data: resp,
//duration: 3000

35
src/app/admin/admin-basket/data.service.ts
View file

@ -6,6 +6,7 @@ import { map } from 'rxjs/operators'
// import { Apollo, gql } from 'apollo-angular'
import { Project } from '../admin-data.service'
import { AdminService, AdminBasket, BasketNameOnly } from '../../openapi'
export class AdminBasketFile {
constructor(
@ -25,15 +26,15 @@ export class AdminBasketFile {
) {}
}
export class AdminBasket {
constructor(
public name: string,
public files?: AdminBasketFile[],
public columns?: string[],
public uploadFields?: string[],
public projects?: Project[],
) {}
}
// export class AdminBasket {
// constructor(
// public name: string,
// public files?: AdminBasketFile[],
// public columns?: string[],
// public uploadFields?: string[],
// public projects?: Project[],
// ) {}
// }
export class BasketImportResult {
constructor(
@ -122,21 +123,12 @@ export class AdminBasketUploadFieldData {
export class AdminBasketDataService {
constructor(
// private apollo: Apollo,
public adminService: AdminService,
) {}
getBaskets(): Observable<AdminBasket[]> {
getBaskets(): Observable<BasketNameOnly[]> {
// Get the list a basket names
console.warn('Migrate Graphql')
return observableOf()
// return this.apollo.query({
// query: getAdminBasketsQuery,
// }).pipe(map(
// res => res['data']['admin_baskets'].map(
// (data: object) => new AdminBasket(
// data['name'],
// )
// )
// ))
return this.adminService.getBasketsApiAdminBasketGet()
}
getBasketUploadFieldData(): Observable<AdminBasketUploadFieldData> {
@ -160,6 +152,7 @@ export class AdminBasketDataService {
getBasket(name: string): Observable<AdminBasket> {
// Get all info and content of a basket
return this.adminService.getBasketApiAdminBasketNameGet(name)
console.warn('Migrate Graphql')
return observableOf()
// return this.apollo.query({