From d1bb6241e918c5394bab433c7c0f857e624033ac Mon Sep 17 00:00:00 2001
From: panabonic <panabonic@gmail.com>
Date: Sat, 30 Dec 2023 13:01:29 +0300
Subject: [PATCH 1/2] document field sorting fixed

---
 .../types/basic/feedback/feedback-section.component.html     | 5 -----
 .../types/basic/feedback/feedback-section.component.ts       | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/app/_modules/pages/sections/types/basic/feedback/feedback-section.component.html b/src/app/_modules/pages/sections/types/basic/feedback/feedback-section.component.html
index cd5c92b..aea7fe5 100644
--- a/src/app/_modules/pages/sections/types/basic/feedback/feedback-section.component.html
+++ b/src/app/_modules/pages/sections/types/basic/feedback/feedback-section.component.html
@@ -1,10 +1,5 @@
 <div class="feedback-form">
   <form [formGroup]="formGroup" (submit)="onSubmit()">
-    <div class="title">
-      Для получения достоверных данных об эмиссии парниковых газов, подтверждения, признания и обеспечения доверия к углеродной отчетности как в Российской Федерации, так и за рубежом 
-      необходимо проведение процедур по валидации и верификации заявлений по парниковым газам 
-      (ФЗ 296 — Федеральный закон от 02.07.2021 N 296-ФЗ «Об ограничении выбросов парниковых газов»).
-    </div>
     <div class="form" *ngIf="!sent">
       <object-form [formGroup]="formGroup" [type]="objectType?.name" target="object"></object-form>
       <div class="row">
diff --git a/src/app/_modules/pages/sections/types/basic/feedback/feedback-section.component.ts b/src/app/_modules/pages/sections/types/basic/feedback/feedback-section.component.ts
index 1c142a4..719e3bc 100644
--- a/src/app/_modules/pages/sections/types/basic/feedback/feedback-section.component.ts
+++ b/src/app/_modules/pages/sections/types/basic/feedback/feedback-section.component.ts
@@ -30,7 +30,8 @@ export class FeedbackSectionComponent {
     }
 
     onSubmit() {
-      this.formsService.save('model', this.objectType.name, null, this.formGroup.value).subscribe(res => {
+      this.formGroup.markAllAsTouched();
+      if (this.formGroup.valid) this.formsService.save('model', this.objectType.name, null, this.formGroup.value).subscribe(res => {
         this.sent = true;
       }, error => {
         console.log(error);

From 92888014a22136dd46c92d4fd650d7ee56c294e9 Mon Sep 17 00:00:00 2001
From: panabonic <panabonic@gmail.com>
Date: Sat, 30 Dec 2023 14:15:03 +0300
Subject: [PATCH 2/2] rtl direction for arabic added

---
 src/app/_services/pages.service.ts | 4 ++++
 src/app/app.component.html         | 2 +-
 src/app/app.component.scss         | 3 +++
 src/app/app.component.ts           | 4 ++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/app/_services/pages.service.ts b/src/app/_services/pages.service.ts
index 7aa5192..60f47a8 100644
--- a/src/app/_services/pages.service.ts
+++ b/src/app/_services/pages.service.ts
@@ -36,6 +36,10 @@ export class PagesService {
     this.rootPagesSubject.next(val);
   }
 
+  get isRtl() {
+    return ['ar'].indexOf(this.rootPage?.slug) !== -1;
+  }
+
   get editMode() {
     return this.editModeSubject.value;
   }
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 6e7a429..5bff6a5 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1 +1 @@
-<grid></grid>
+<grid [class.rtl]="isRtl"></grid>
diff --git a/src/app/app.component.scss b/src/app/app.component.scss
index e69de29..068008a 100644
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -0,0 +1,3 @@
+.rtl {
+  direction: rtl;
+}
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 0882277..38e326b 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -18,6 +18,10 @@ export class AppComponent {
     });
   }
 
+  get isRtl() {
+    return this.pagesService.isRtl;
+  }
+
   ngOnInit() {
     this.pagesService.root({include:'children'}).subscribe(
       res => { this.pagesService.rootPages = res }