소스 검색

Добавлен порядок полей форм

Vadim 2 달 전
부모
커밋
8143320d73
2개의 변경된 파일6개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 1
      src/modules/client/activities/c-act-service.ts
  2. 4 3
      src/modules/client/activities/participant-entities/c-pe-service.ts

+ 2 - 1
src/modules/client/activities/c-act-service.ts

@@ -523,7 +523,8 @@ class CActService {
               'title', COALESCE(af.field_title_override, f.title),
               'mask', f.mask,
               'options', f."options",
-              'validators', f.validators
+              'validators', f.validators,
+              'orderNumber', af.order_number
             )) as fields
           from
             act.activity_reg_form_fields af

+ 4 - 3
src/modules/client/activities/participant-entities/c-pe-service.ts

@@ -103,7 +103,8 @@ class CPeService {
             'title', coalesce(pff.field_title_override, cfd.title), 
             'mask', cfd.mask, 
             'options', cfd.options,
-            'validators', cfwv.validators
+            'validators', cfwv.validators,
+            'orderNumber', pff.order_number
           )) as fields
         from
           act.pe_form_fields pff
@@ -281,7 +282,7 @@ class CPeService {
                 'validators',
                 cfwv.validators,
                 'orderNumber',
-                pff.order_number,
+                pff.order_number
             )) filter (
           where
             cfwv.field_definition_id is not null),
@@ -348,7 +349,7 @@ class CPeService {
               'validators',
               cfwv.validators,
               'orderNumber',
-              pff.order_number,
+              pff.order_number
             )) filter (
           where
             cfwv.field_definition_id is not null),