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

src/api/v_0.1.0/types/custom-fields-types.ts

@@ -22,6 +22,7 @@ export const CustomField = z.object({
   title: z.string(),
   mask: z.string().nullable(),
   options: z.array(z.string()).nullable(),
+  orderNumber: z.number().int().nullable(),
 });
 
 export const CustomFieldWithValidators = CustomField.extend({

src/db/db-schema.ts

@@ -86,6 +86,7 @@ const DbSchema = {
       fieldDefinitionId: z.string().uuid(),
       fieldTitleOverride: z.string().nullable(),
       userIdentityOrdinalNumber: z.number().int().nullable(),
+      orderNumber: z.number().int().nullable(),
     },
     userEventFieldValues: {
       // Таблица user_event_fields_values из новой БД
@@ -217,6 +218,7 @@ const DbSchema = {
       fieldTitleOverride: z.string().nullable(),
       isCopyUserValue: z.boolean(),
       isChangeResetStatus: z.boolean(),
+      orderNumber: z.number().int().nullable(),
     },
     activityRegs: {
       activityRegId: z.string().uuid(),
@@ -254,6 +256,7 @@ const DbSchema = {
       fieldDefinitionId: z.string().uuid(),
       fieldTitleOverride: z.string().nullable(),
       isCopyUserValue: z.boolean(),
+      orderNumber: z.number().int().nullable(),
     },
     peFieldValues: {
       // Таблица pe_field_values из новой БД

src/modules/client/activities/c-act-service.ts

@@ -593,7 +593,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

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

@@ -273,7 +273,9 @@ class CPeService {
                 'options',
                 cfwv.options,
                 'validators',
-                cfwv.validators
+                cfwv.validators,
+                'orderNumber',
+                pff.order_number,
             )) filter (
           where
             cfwv.field_definition_id is not null),
@@ -336,7 +338,9 @@ class CPeService {
               'options',
               cfwv.options,
               'validators',
-              cfwv.validators
+              cfwv.validators,
+              'orderNumber',
+              pff.order_number,
             )) filter (
           where
             cfwv.field_definition_id is not null),

src/modules/client/users/c-users-service.ts

@@ -22,7 +22,8 @@ class CUsersService {
             cfwv.mask,
             cfwv."options",
             cfwv.validators,
-            uefv.value as "value"
+            uefv.value as "value",
+            uef.order_number as "orderNumber" 
           from
             ev.user_event_fields uef
           join cf.custom_fields_with_validators cfwv on