@hitsoft/e-donusum 1.0.5 → 1.0.6

package/src/lib/params-generals/params-general/params-general.module.ts

@@ -1,34 +0,0 @@
-import { CoreModule } from '@abp/ng.core';
-import { ThemeSharedModule } from '@abp/ng.theme.shared';
-import { NgModule } from '@angular/core';
-import {
-  NgbCollapseModule,
-  NgbDatepickerModule,
-  NgbDropdownModule,
-} from '@ng-bootstrap/ng-bootstrap';
-import { NgxValidateCoreModule } from '@ngx-validate/core';
-import { CommercialUiModule } from '@volo/abp.commercial.ng.ui';
-import { PageModule } from '@abp/ng.components/page';
-import { ParamsGeneralComponent } from './components/params-general.component';
-import { ParamsGeneralRoutingModule } from './params-general-routing.module';
-
-@NgModule({
-  declarations: [ParamsGeneralComponent],
-  imports: [
-    ParamsGeneralRoutingModule,
-    CoreModule,
-    ThemeSharedModule,
-    CommercialUiModule,
-    NgxValidateCoreModule,
-    NgbCollapseModule,
-    NgbDatepickerModule,
-    NgbDropdownModule,
-
-    PageModule,
-  ],
-})
-export class ParamsGeneralModule {}
-
-export function loadParamsGeneralModuleAsChild() {
-  return Promise.resolve(ParamsGeneralModule);
-}

package/src/lib/params-integrators/params-integrator/components/params-integrator.component.html

@@ -1,499 +0,0 @@
-<abp-page [title]="'eDonusum::ParamsIntegrators' | abpLocalization">
-  <abp-page-toolbar-container class="col">
-    <div class="text-lg-end pt-2">
-      <button
-        class="btn btn-primary btn-sm mx-2"
-        type="button"
-        [disabled]="isExportToExcelBusy"
-        (click)="exportToExcel()"
-      >
-        {{ 'eDonusum::ExportToExcel' | abpLocalization }}
-      </button>
-
-      <button
-        *abpPermission="'eDonusum.ParamsIntegrators.Create'"
-        class="btn btn-primary btn-sm"
-        type="button"
-        (click)="create()"
-      >
-        <i class="fa fa-plus me-1" aria-hidden="true"></i>
-        {{ 'eDonusum::NewParamsIntegrator' | abpLocalization }}
-      </button>
-    </div>
-  </abp-page-toolbar-container>
-
-  <abp-advanced-entity-filters localizationSourceName="eDonusum" [list]="list">
-    <abp-advanced-entity-filters-form>
-      <form #filterForm (keyup.enter)="list.get()">
-        <div class="row">
-          <div class="col-12 col-sm-auto">
-            <div class="mb-3">
-              <label class="form-label" for="serviceUserFilter">
-                {{ 'eDonusum::ServiceUser' | abpLocalization }}
-              </label>
-
-              <input
-                id="serviceUserFilter"
-                class="form-control"
-                [(ngModel)]="filters.serviceUser"
-                [ngModelOptions]="{ standalone: true }"
-              />
-            </div>
-          </div>
-          <div class="col-12 col-sm-auto">
-            <div class="mb-3">
-              <label class="form-label" for="servicePasswordFilter">
-                {{ 'eDonusum::ServicePassword' | abpLocalization }}
-              </label>
-
-              <input
-                id="servicePasswordFilter"
-                class="form-control"
-                [(ngModel)]="filters.servicePassword"
-                [ngModelOptions]="{ standalone: true }"
-              />
-            </div>
-          </div>
-          <div class="col-12 col-sm-auto">
-            <div class="mb-3">
-              <label class="form-label" for="eInvoiceGBLabelFilter">
-                {{ 'eDonusum::EInvoiceGBLabel' | abpLocalization }}
-              </label>
-
-              <input
-                id="eInvoiceGBLabelFilter"
-                class="form-control"
-                [(ngModel)]="filters.eInvoiceGBLabel"
-                [ngModelOptions]="{ standalone: true }"
-              />
-            </div>
-          </div>
-          <div class="col-12 col-sm-auto">
-            <div class="mb-3">
-              <label class="form-label" for="eInvoicePKLabelFilter">
-                {{ 'eDonusum::EInvoicePKLabel' | abpLocalization }}
-              </label>
-
-              <input
-                id="eInvoicePKLabelFilter"
-                class="form-control"
-                [(ngModel)]="filters.eInvoicePKLabel"
-                [ngModelOptions]="{ standalone: true }"
-              />
-            </div>
-          </div>
-          <div class="col-12 col-sm-auto">
-            <div class="mb-3">
-              <label class="form-label" for="eDispatchGBLabelFilter">
-                {{ 'eDonusum::EDispatchGBLabel' | abpLocalization }}
-              </label>
-
-              <input
-                id="eDispatchGBLabelFilter"
-                class="form-control"
-                [(ngModel)]="filters.eDispatchGBLabel"
-                [ngModelOptions]="{ standalone: true }"
-              />
-            </div>
-          </div>
-          <div class="col-12 col-sm-auto">
-            <div class="mb-3">
-              <label class="form-label" for="eDispatchPKLabelFilter">
-                {{ 'eDonusum::EDispatchPKLabel' | abpLocalization }}
-              </label>
-
-              <input
-                id="eDispatchPKLabelFilter"
-                class="form-control"
-                [(ngModel)]="filters.eDispatchPKLabel"
-                [ngModelOptions]="{ standalone: true }"
-              />
-            </div>
-          </div>
-          <div class="col-12 col-sm-auto">
-            <div class="mb-3">
-              <label class="form-label" for="eArchiveGBLabelFilter">
-                {{ 'eDonusum::EArchiveGBLabel' | abpLocalization }}
-              </label>
-
-              <input
-                id="eArchiveGBLabelFilter"
-                class="form-control"
-                [(ngModel)]="filters.eArchiveGBLabel"
-                [ngModelOptions]="{ standalone: true }"
-              />
-            </div>
-          </div>
-          <div class="col-12 col-sm-auto">
-            <div class="mb-3">
-              <label class="form-label" for="eArchivePKLabelFilter">
-                {{ 'eDonusum::EArchivePKLabel' | abpLocalization }}
-              </label>
-
-              <input
-                id="eArchivePKLabelFilter"
-                class="form-control"
-                [(ngModel)]="filters.eArchivePKLabel"
-                [ngModelOptions]="{ standalone: true }"
-              />
-            </div>
-          </div>
-          <div class="col-12 col-sm-auto">
-            <div class="mb-3">
-              <label class="form-label" for="emmGBLabelFilter">
-                {{ 'eDonusum::EmmGBLabel' | abpLocalization }}
-              </label>
-
-              <input
-                id="emmGBLabelFilter"
-                class="form-control"
-                [(ngModel)]="filters.emmGBLabel"
-                [ngModelOptions]="{ standalone: true }"
-              />
-            </div>
-          </div>
-          <div class="col-12 col-sm-auto">
-            <div class="mb-3">
-              <label class="form-label" for="emmPKLabelFilter">
-                {{ 'eDonusum::EmmPKLabel' | abpLocalization }}
-              </label>
-
-              <input
-                id="emmPKLabelFilter"
-                class="form-control"
-                [(ngModel)]="filters.emmPKLabel"
-                [ngModelOptions]="{ standalone: true }"
-              />
-            </div>
-          </div>
-          <div class="col-12 col-sm-auto">
-            <div class="mb-3">
-              <label class="form-label" for="branchIdFilter">
-                {{ 'eDonusum::Branch' | abpLocalization }}
-              </label>
-              <abp-lookup-select
-                cid="branchIdFilter"
-                [getFn]="service.getBranchLookup"
-                [(ngModel)]="filters.branchId"
-                [ngModelOptions]="{ standalone: true }"
-              ></abp-lookup-select>
-            </div>
-          </div>
-
-          <div class="col-12 col-sm-auto align-self-end mb-3">
-            <div class="row">
-              <div class="col-6 col-sm-auto d-grid">
-                <button type="button" class="btn btn-outline-primary" (click)="clearFilters()">
-                  <span>{{ 'AbpUi::Clear' | abpLocalization }}</span>
-                </button>
-              </div>
-              <div class="col-6 col-sm-auto d-grid">
-                <button type="button" class="btn btn-primary" (click)="list.get()">
-                  <span>{{ 'AbpUi::Refresh' | abpLocalization }}</span>
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </form>
-    </abp-advanced-entity-filters-form>
-  </abp-advanced-entity-filters>
-
-  <div class="card">
-    <div class="card-body">
-      <ngx-datatable [rows]="data.items" [count]="data.totalCount" [list]="list" default>
-        <ngx-datatable-column
-          [name]="'AbpUi::Actions' | abpLocalization"
-          [maxWidth]="150"
-          [width]="150"
-          [sortable]="false"
-        >
-          <ng-template let-row="row" let-i="rowIndex" ngx-datatable-cell-template>
-            <div ngbDropdown container="body" class="d-inline-block">
-              <button
-                class="btn btn-primary btn-sm dropdown-toggle"
-                data-toggle="dropdown"
-                aria-haspopup="true"
-                ngbDropdownToggle
-              >
-                <i class="fa fa-cog me-1" aria-hidden="true"></i>
-                {{ 'AbpUi::Actions' | abpLocalization }}
-              </button>
-
-              <div ngbDropdownMenu>
-                <button
-                  ngbDropdownItem
-                  *abpPermission="'eDonusum.ParamsIntegrators.Edit'"
-                  (click)="update(row)"
-                >
-                  {{ 'AbpUi::Edit' | abpLocalization }}
-                </button>
-
-                <button
-                  ngbDropdownItem
-                  *abpPermission="'eDonusum.ParamsIntegrators.Delete'"
-                  (click)="delete(row)"
-                >
-                  {{ 'AbpUi::Delete' | abpLocalization }}
-                </button>
-              </div>
-            </div>
-          </ng-template>
-        </ngx-datatable-column>
-
-        <ngx-datatable-column
-          name="{{ 'eDonusum::ServiceUser' | abpLocalization }}"
-          prop="paramsIntegrator.serviceUser"
-        >
-          <ng-template let-row="row" ngx-datatable-cell-template>
-            {{ row.paramsIntegrator.serviceUser }}
-          </ng-template>
-        </ngx-datatable-column>
-
-        <ngx-datatable-column
-          name="{{ 'eDonusum::ServicePassword' | abpLocalization }}"
-          prop="paramsIntegrator.servicePassword"
-        >
-          <ng-template let-row="row" ngx-datatable-cell-template>
-            {{ row.paramsIntegrator.servicePassword }}
-          </ng-template>
-        </ngx-datatable-column>
-
-        <ngx-datatable-column
-          name="{{ 'eDonusum::EInvoiceGBLabel' | abpLocalization }}"
-          prop="paramsIntegrator.eInvoiceGBLabel"
-        >
-          <ng-template let-row="row" ngx-datatable-cell-template>
-            {{ row.paramsIntegrator.eInvoiceGBLabel }}
-          </ng-template>
-        </ngx-datatable-column>
-
-        <ngx-datatable-column
-          name="{{ 'eDonusum::EInvoicePKLabel' | abpLocalization }}"
-          prop="paramsIntegrator.eInvoicePKLabel"
-        >
-          <ng-template let-row="row" ngx-datatable-cell-template>
-            {{ row.paramsIntegrator.eInvoicePKLabel }}
-          </ng-template>
-        </ngx-datatable-column>
-
-        <ngx-datatable-column
-          name="{{ 'eDonusum::EDispatchGBLabel' | abpLocalization }}"
-          prop="paramsIntegrator.eDispatchGBLabel"
-        >
-          <ng-template let-row="row" ngx-datatable-cell-template>
-            {{ row.paramsIntegrator.eDispatchGBLabel }}
-          </ng-template>
-        </ngx-datatable-column>
-
-        <ngx-datatable-column
-          name="{{ 'eDonusum::EDispatchPKLabel' | abpLocalization }}"
-          prop="paramsIntegrator.eDispatchPKLabel"
-        >
-          <ng-template let-row="row" ngx-datatable-cell-template>
-            {{ row.paramsIntegrator.eDispatchPKLabel }}
-          </ng-template>
-        </ngx-datatable-column>
-
-        <ngx-datatable-column
-          name="{{ 'eDonusum::EArchiveGBLabel' | abpLocalization }}"
-          prop="paramsIntegrator.eArchiveGBLabel"
-        >
-          <ng-template let-row="row" ngx-datatable-cell-template>
-            {{ row.paramsIntegrator.eArchiveGBLabel }}
-          </ng-template>
-        </ngx-datatable-column>
-
-        <ngx-datatable-column
-          name="{{ 'eDonusum::EArchivePKLabel' | abpLocalization }}"
-          prop="paramsIntegrator.eArchivePKLabel"
-        >
-          <ng-template let-row="row" ngx-datatable-cell-template>
-            {{ row.paramsIntegrator.eArchivePKLabel }}
-          </ng-template>
-        </ngx-datatable-column>
-
-        <ngx-datatable-column
-          name="{{ 'eDonusum::EmmGBLabel' | abpLocalization }}"
-          prop="paramsIntegrator.emmGBLabel"
-        >
-          <ng-template let-row="row" ngx-datatable-cell-template>
-            {{ row.paramsIntegrator.emmGBLabel }}
-          </ng-template>
-        </ngx-datatable-column>
-
-        <ngx-datatable-column
-          name="{{ 'eDonusum::EmmPKLabel' | abpLocalization }}"
-          prop="paramsIntegrator.emmPKLabel"
-        >
-          <ng-template let-row="row" ngx-datatable-cell-template>
-            {{ row.paramsIntegrator.emmPKLabel }}
-          </ng-template>
-        </ngx-datatable-column>
-
-        <ngx-datatable-column name="{{ 'eDonusum::Branch' | abpLocalization }}" prop="branch.name">
-          <ng-template let-row="row" ngx-datatable-cell-template>
-            {{ row.branch?.name }}
-          </ng-template>
-        </ngx-datatable-column>
-      </ngx-datatable>
-    </div>
-  </div>
-</abp-page>
-
-<abp-modal [busy]="isModalBusy" [(visible)]="isModalOpen">
-  <ng-template #abpHeader>
-    <h3>
-      {{ (selected ? 'AbpUi::Edit' : 'eDonusum::NewParamsIntegrator') | abpLocalization }}
-    </h3>
-  </ng-template>
-
-  <ng-template #abpBody>
-    <form [formGroup]="form" id="params-integrator" (ngSubmit)="submitForm()" validateOnSubmit>
-      <div class="mt-2 fade-in-top">
-        <div class="mb-3">
-          <label class="form-label" for="params-integrator-service-user">
-            {{ 'eDonusum::ServiceUser' | abpLocalization }}
-          </label>
-
-          <input
-            id="params-integrator-service-user"
-            formControlName="serviceUser"
-            class="form-control"
-            maxlength="64"
-            autofocus
-          />
-        </div>
-        <div class="mb-3">
-          <label class="form-label" for="params-integrator-service-password">
-            {{ 'eDonusum::ServicePassword' | abpLocalization }}
-          </label>
-
-          <input
-            id="params-integrator-service-password"
-            formControlName="servicePassword"
-            class="form-control"
-            maxlength="64"
-          />
-        </div>
-        <div class="mb-3">
-          <label class="form-label" for="params-integrator-einvoice-gblabel">
-            {{ 'eDonusum::EInvoiceGBLabel' | abpLocalization }}
-          </label>
-
-          <input
-            id="params-integrator-einvoice-gblabel"
-            formControlName="eInvoiceGBLabel"
-            class="form-control"
-            maxlength="256"
-          />
-        </div>
-        <div class="mb-3">
-          <label class="form-label" for="params-integrator-einvoice-pklabel">
-            {{ 'eDonusum::EInvoicePKLabel' | abpLocalization }}
-          </label>
-
-          <input
-            id="params-integrator-einvoice-pklabel"
-            formControlName="eInvoicePKLabel"
-            class="form-control"
-            maxlength="256"
-          />
-        </div>
-        <div class="mb-3">
-          <label class="form-label" for="params-integrator-edispatch-gblabel">
-            {{ 'eDonusum::EDispatchGBLabel' | abpLocalization }}
-          </label>
-
-          <input
-            id="params-integrator-edispatch-gblabel"
-            formControlName="eDispatchGBLabel"
-            class="form-control"
-            maxlength="256"
-          />
-        </div>
-        <div class="mb-3">
-          <label class="form-label" for="params-integrator-edispatch-pklabel">
-            {{ 'eDonusum::EDispatchPKLabel' | abpLocalization }}
-          </label>
-
-          <input
-            id="params-integrator-edispatch-pklabel"
-            formControlName="eDispatchPKLabel"
-            class="form-control"
-            maxlength="256"
-          />
-        </div>
-        <div class="mb-3">
-          <label class="form-label" for="params-integrator-earchive-gblabel">
-            {{ 'eDonusum::EArchiveGBLabel' | abpLocalization }}
-          </label>
-
-          <input
-            id="params-integrator-earchive-gblabel"
-            formControlName="eArchiveGBLabel"
-            class="form-control"
-            maxlength="256"
-          />
-        </div>
-        <div class="mb-3">
-          <label class="form-label" for="params-integrator-earchive-pklabel">
-            {{ 'eDonusum::EArchivePKLabel' | abpLocalization }}
-          </label>
-
-          <input
-            id="params-integrator-earchive-pklabel"
-            formControlName="eArchivePKLabel"
-            class="form-control"
-            maxlength="256"
-          />
-        </div>
-        <div class="mb-3">
-          <label class="form-label" for="params-integrator-emm-gblabel">
-            {{ 'eDonusum::EmmGBLabel' | abpLocalization }}
-          </label>
-
-          <input
-            id="params-integrator-emm-gblabel"
-            formControlName="emmGBLabel"
-            class="form-control"
-            maxlength="256"
-          />
-        </div>
-        <div class="mb-3">
-          <label class="form-label" for="params-integrator-emm-pklabel">
-            {{ 'eDonusum::EmmPKLabel' | abpLocalization }}
-          </label>
-
-          <input
-            id="params-integrator-emm-pklabel"
-            formControlName="emmPKLabel"
-            class="form-control"
-            maxlength="256"
-          />
-        </div>
-        <div class="mb-3">
-          <label class="form-label" for="params-integrator-branch-id">
-            {{ 'eDonusum::Branch' | abpLocalization }}
-          </label>
-
-          <abp-lookup-select
-            cid="params-integrator-branch-id"
-            formControlName="branchId"
-            [getFn]="service.getBranchLookup"
-          ></abp-lookup-select>
-        </div>
-      </div>
-    </form>
-  </ng-template>
-
-  <ng-template #abpFooter>
-    <button type="button" class="btn btn-secondary" abpClose>
-      {{ 'AbpUi::Cancel' | abpLocalization }}
-    </button>
-
-    <abp-button iconClass="fa fa-check" buttonType="submit" formName="params-integrator">
-      {{ 'AbpUi::Save' | abpLocalization }}
-    </abp-button>
-  </ng-template>
-</abp-modal>

package/src/lib/params-integrators/params-integrator/components/params-integrator.component.ts

@@ -1,162 +0,0 @@
-import { ABP, downloadBlob, ListService, PagedResultDto, TrackByService } from '@abp/ng.core';
-import { Confirmation, ConfirmationService } from '@abp/ng.theme.shared';
-import { DateAdapter } from '@abp/ng.theme.shared/extensions';
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { NgbDateAdapter } from '@ng-bootstrap/ng-bootstrap';
-import { filter, finalize, switchMap, tap } from 'rxjs/operators';
-import type {
-  GetParamsIntegratorsInput,
-  ParamsIntegratorWithNavigationPropertiesDto,
-} from '../../../proxy/params-integrators/models';
-import { ParamsIntegratorService } from '../../../proxy/params-integrators/params-integrator.service';
-@Component({
-  selector: 'lib-params-integrator',
-  changeDetection: ChangeDetectionStrategy.Default,
-  providers: [ListService, { provide: NgbDateAdapter, useClass: DateAdapter }],
-  templateUrl: './params-integrator.component.html',
-  styles: [],
-})
-export class ParamsIntegratorComponent implements OnInit {
-  data: PagedResultDto<ParamsIntegratorWithNavigationPropertiesDto> = {
-    items: [],
-    totalCount: 0,
-  };
-
-  filters = {} as GetParamsIntegratorsInput;
-
-  form: FormGroup;
-
-  isFiltersHidden = true;
-
-  isModalBusy = false;
-
-  isModalOpen = false;
-
-  isExportToExcelBusy = false;
-
-  selected?: ParamsIntegratorWithNavigationPropertiesDto;
-
-  constructor(
-    public readonly list: ListService,
-    public readonly track: TrackByService,
-    public readonly service: ParamsIntegratorService,
-    private confirmation: ConfirmationService,
-    private fb: FormBuilder
-  ) {}
-
-  ngOnInit() {
-    const getData = (query: ABP.PageQueryParams) =>
-      this.service.getList({
-        ...query,
-        ...this.filters,
-        filterText: query.filter,
-      });
-
-    const setData = (list: PagedResultDto<ParamsIntegratorWithNavigationPropertiesDto>) =>
-      (this.data = list);
-
-    this.list.hookToQuery(getData).subscribe(setData);
-  }
-
-  clearFilters() {
-    this.filters = {} as GetParamsIntegratorsInput;
-  }
-
-  buildForm() {
-    const {
-      serviceUser,
-      servicePassword,
-      eInvoiceGBLabel,
-      eInvoicePKLabel,
-      eDispatchGBLabel,
-      eDispatchPKLabel,
-      eArchiveGBLabel,
-      eArchivePKLabel,
-      emmGBLabel,
-      emmPKLabel,
-      branchId,
-    } = this.selected?.paramsIntegrator || {};
-
-    this.form = this.fb.group({
-      serviceUser: [serviceUser ?? null, [Validators.maxLength(64)]],
-      servicePassword: [servicePassword ?? null, [Validators.maxLength(64)]],
-      eInvoiceGBLabel: [eInvoiceGBLabel ?? null, [Validators.maxLength(256)]],
-      eInvoicePKLabel: [eInvoicePKLabel ?? null, [Validators.maxLength(256)]],
-      eDispatchGBLabel: [eDispatchGBLabel ?? null, [Validators.maxLength(256)]],
-      eDispatchPKLabel: [eDispatchPKLabel ?? null, [Validators.maxLength(256)]],
-      eArchiveGBLabel: [eArchiveGBLabel ?? null, [Validators.maxLength(256)]],
-      eArchivePKLabel: [eArchivePKLabel ?? null, [Validators.maxLength(256)]],
-      emmGBLabel: [emmGBLabel ?? null, [Validators.maxLength(256)]],
-      emmPKLabel: [emmPKLabel ?? null, [Validators.maxLength(256)]],
-      branchId: [branchId ?? null, []],
-    });
-  }
-
-  hideForm() {
-    this.isModalOpen = false;
-    this.form.reset();
-  }
-
-  showForm() {
-    this.buildForm();
-    this.isModalOpen = true;
-  }
-
-  submitForm() {
-    if (this.form.invalid) return;
-
-    const request = this.selected
-      ? this.service.update(this.selected.paramsIntegrator.id, {
-          ...this.form.value,
-          concurrencyStamp: this.selected.paramsIntegrator.concurrencyStamp,
-        })
-      : this.service.create(this.form.value);
-
-    this.isModalBusy = true;
-
-    request
-      .pipe(
-        finalize(() => (this.isModalBusy = false)),
-        tap(() => this.hideForm())
-      )
-      .subscribe(this.list.get);
-  }
-
-  create() {
-    this.selected = undefined;
-    this.showForm();
-  }
-
-  update(record: ParamsIntegratorWithNavigationPropertiesDto) {
-    this.selected = record;
-    this.showForm();
-  }
-
-  delete(record: ParamsIntegratorWithNavigationPropertiesDto) {
-    this.confirmation
-      .warn('eDonusum::DeleteConfirmationMessage', 'eDonusum::AreYouSure', {
-        messageLocalizationParams: [],
-      })
-      .pipe(
-        filter(status => status === Confirmation.Status.confirm),
-        switchMap(() => this.service.delete(record.paramsIntegrator.id))
-      )
-      .subscribe(this.list.get);
-  }
-
-  exportToExcel() {
-    this.isExportToExcelBusy = true;
-    this.service
-      .getDownloadToken()
-      .pipe(
-        switchMap(({ token }) =>
-          this.service.getListAsExcelFile({ downloadToken: token, filterText: this.list.filter })
-        ),
-        finalize(() => (this.isExportToExcelBusy = false))
-      )
-      .subscribe(result => {
-        downloadBlob(result, 'ParamsIntegrator.xlsx');
-      });
-  }
-}