diff --git a/src/app/_modules/auth/forms/forget/auth-form-password-forget.component.ts b/src/app/_modules/auth/forms/forget/auth-form-password-forget.component.ts index e4d455e..c75cc0b 100644 --- a/src/app/_modules/auth/forms/forget/auth-form-password-forget.component.ts +++ b/src/app/_modules/auth/forms/forget/auth-form-password-forget.component.ts @@ -31,7 +31,7 @@ export class AuthFormPasswordForgetComponent implements OnInit { return this.f?.email?.value; } - onSubmit() {console.log(111) + onSubmit() { if (this.form.invalid) return; this.loading = true; this.authenticationService.forget(this.email).subscribe(res => { diff --git a/src/app/_modules/form-fields/types/document/form-field-document.module.ts b/src/app/_modules/form-fields/types/document/form-field-document.module.ts index b2cf679..be61273 100644 --- a/src/app/_modules/form-fields/types/document/form-field-document.module.ts +++ b/src/app/_modules/form-fields/types/document/form-field-document.module.ts @@ -7,12 +7,14 @@ import {FieldDocumentSingleComponent} from "@app/_modules/form-fields/types/docu import {FieldDocumentMultipleComponent} from "@app/_modules/form-fields/types/document/multiple/field-document-multiple.component"; import { WidjetModule } from '@app/_modules/widjet/widjet.module'; import {FieldDocumentValueComponent} from "@app/_modules/form-fields/types/document/value/field-document-value.component"; +import {SortablejsModule} from "@dustfoundation/ngx-sortablejs"; @NgModule({ imports: [ CommonModule, ReactiveFormsModule, WidjetModule, + SortablejsModule ], declarations: [ FormFieldDocumentComponent, diff --git a/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.html b/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.html index 4d2b5ab..38e684b 100644 --- a/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.html +++ b/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.html @@ -9,6 +9,6 @@
-
+
diff --git a/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.ts b/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.ts index b307449..82a1eda 100644 --- a/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.ts +++ b/src/app/_modules/form-fields/types/document/multiple/field-document-multiple.component.ts @@ -2,6 +2,7 @@ import {Component, HostListener, Input} from '@angular/core'; import {FormGroup} from "@angular/forms"; import {AssetsService} from "@app/_services/assets.service"; import {HttpEventType, HttpResponse} from "@angular/common/http"; +import {SortableOptions} from "sortablejs"; @Component({ selector: 'field-document-multiple', @@ -16,6 +17,13 @@ export class FieldDocumentMultipleComponent { public upload: any = {file: null, progress: 0}; public dragOver = false; + public documentsValues: SortableOptions = { + group: 'doc-values', + handle: 'file-ico', + // onUpdate: (event: any) => {this.move(event)}, + // onAdd: (event: any) => {this.move(event)} + }; + @HostListener("dragover", ["$event"]) @HostListener("dragenter", ["$event"]) @HostListener("dragend", ["$event"]) diff --git a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts index 43660a8..b6b02a6 100644 --- a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts +++ b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts @@ -89,7 +89,6 @@ export class JumbotronComponent { } get editable(){ - console.log(this.currentPage) return this.currentPage&&(this.authService.privileges?.admin|| this.authService.privileges?.editor); } diff --git a/src/vniigaz-v2/css/_forms.scss b/src/vniigaz-v2/css/_forms.scss index 8233e4c..f4d9077 100644 --- a/src/vniigaz-v2/css/_forms.scss +++ b/src/vniigaz-v2/css/_forms.scss @@ -216,6 +216,9 @@ form-field-document{ line-height: 24px; color: var(--second); } + file-ico{ + cursor: move; + } } .doc-item-form{ input{