From 4a5c445a5d856a96e00a28dcbf4de45a81c6b1dd Mon Sep 17 00:00:00 2001 From: Dmitry Sherstobitov Date: Fri, 24 Nov 2023 17:27:45 +0200 Subject: [PATCH 1/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D1=81=D1=87=D0=B5=D1=82=D1=87=D0=B8=D0=BA=20=D1=81=D1=81?= =?UTF-8?q?=D1=8B=D0=BB=D0=BE=D0=BA=20=D0=B2=20=D0=B7=D0=B0=D0=B3=D1=80?= =?UTF-8?q?=D1=83=D0=BA=D1=83=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ext/Form.xml" | 120 ++++++++++++++++-- .../Ext/Form/Module.bsl" | 25 ++++ 2 files changed, 134 insertions(+), 11 deletions(-) diff --git "a/VanessaAutomation/Forms/\320\237\320\276\320\264\320\263\320\276\321\202\320\276\320\262\320\272\320\260\320\230\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\224\320\260\320\275\320\275\321\213\321\205/Ext/Form.xml" "b/VanessaAutomation/Forms/\320\237\320\276\320\264\320\263\320\276\321\202\320\276\320\262\320\272\320\260\320\230\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\224\320\260\320\275\320\275\321\213\321\205/Ext/Form.xml" index 4c686951bc..6ba9cc2076 100644 --- "a/VanessaAutomation/Forms/\320\237\320\276\320\264\320\263\320\276\321\202\320\276\320\262\320\272\320\260\320\230\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\224\320\260\320\275\320\275\321\213\321\205/Ext/Form.xml" +++ "b/VanessaAutomation/Forms/\320\237\320\276\320\264\320\263\320\276\321\202\320\276\320\262\320\272\320\260\320\230\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\224\320\260\320\275\320\275\321\213\321\205/Ext/Form.xml" @@ -160,8 +160,9 @@ Parameters for upload ValueStorage to files - Vertical + AlwaysHorizontal Collapsible + true Picture NormalSeparation @@ -197,6 +198,7 @@ true + Usual None false @@ -242,6 +244,7 @@ Group pages + TabsOnTop @@ -258,12 +261,14 @@ + Usual None false Vertical + Usual None false @@ -275,16 +280,64 @@ false - - + + + <v8:item> + <v8:lang>en</v8:lang> + <v8:content>Metadata list group select</v8:content> + </v8:item> + + + + en + Metadata list group select + + + Compact + + + + + + + + + <v8:item> + <v8:lang>en</v8:lang> + <v8:content>Metadata list group sort</v8:content> + </v8:item> + + + + en + Metadata list group sort + + + Compact + + + + + + + @@ -419,11 +477,18 @@ + + MetadataList.Count + EnterOnInput + + + + Usual None false @@ -513,6 +578,7 @@ AlwaysHorizontal + Usual None false @@ -661,6 +727,7 @@ Group feature command + Usual None false @@ -843,6 +910,22 @@ v8ui:Picture + + + <v8:item> + <v8:lang>en</v8:lang> + <v8:content>Count</v8:content> + </v8:item> + + + xs:decimal + + 10 + 0 + Any + + + @@ -1328,6 +1411,21 @@ DeselectAll + + + <v8:item> + <v8:lang>en</v8:lang> + <v8:content>Update count</v8:content> + </v8:item> + + + + en + Update metadata count + + + UpdateMetadataCount + diff --git "a/VanessaAutomation/Forms/\320\237\320\276\320\264\320\263\320\276\321\202\320\276\320\262\320\272\320\260\320\230\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\224\320\260\320\275\320\275\321\213\321\205/Ext/Form/Module.bsl" "b/VanessaAutomation/Forms/\320\237\320\276\320\264\320\263\320\276\321\202\320\276\320\262\320\272\320\260\320\230\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\224\320\260\320\275\320\275\321\213\321\205/Ext/Form/Module.bsl" index b67c4888db..f1eb8353f1 100644 --- "a/VanessaAutomation/Forms/\320\237\320\276\320\264\320\263\320\276\321\202\320\276\320\262\320\272\320\260\320\230\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\224\320\260\320\275\320\275\321\213\321\205/Ext/Form/Module.bsl" +++ "b/VanessaAutomation/Forms/\320\237\320\276\320\264\320\263\320\276\321\202\320\276\320\262\320\272\320\260\320\230\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\224\320\260\320\275\320\275\321\213\321\205/Ext/Form/Module.bsl" @@ -1173,6 +1173,31 @@ Procedure SelectDependentItems(Command) SelectDependentItemsAtServer(); EndProcedure +&AtServer +Procedure UpdateMetadataCountAtServer() + + Template = "SELECT SUM(1) AS Count FROM "; + + For Each MetaGroup In MetadataList.GetItems() Do + tmpCount = 0; + For Each MetaName In MetaGroup.GetItems() Do + + Query = New Query(); + Query.Text = Template + MetaName.FullName; + QueryResult = Query.Execute().Select(); + QueryResult.Next(); + MetaName.Count = QueryResult.Count; + tmpCount = tmpCount + MetaName.Count; + EndDo; + MetaGroup.Count = tmpCount; + EndDo; +EndProcedure + +&AtClient +Procedure UpdateMetadataCount(Command) + UpdateMetadataCountAtServer(); +EndProcedure + &AtClient Procedure SelectAll(Команда) SetMarks(True); From 1eda140b44c77f892222c79d5314103a25bb4939 Mon Sep 17 00:00:00 2001 From: Pautov Leonid Date: Sun, 24 Mar 2024 13:41:49 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=94=D0=BB=D1=8F=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=85=D0=BE=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...0\320\270\320\250\320\260\320\263\320\276\320\262.feature" | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git "a/features/Core/TestDataGenerator/\320\237\321\200\320\276\320\262\320\265\321\200\320\272\320\260\320\223\320\265\320\275\320\265\321\200\320\260\321\206\320\270\320\270\320\250\320\260\320\263\320\276\320\262.feature" "b/features/Core/TestDataGenerator/\320\237\321\200\320\276\320\262\320\265\321\200\320\272\320\260\320\223\320\265\320\275\320\265\321\200\320\260\321\206\320\270\320\270\320\250\320\260\320\263\320\276\320\262.feature" index 9563d85f1b..37e93e1162 100644 --- "a/features/Core/TestDataGenerator/\320\237\321\200\320\276\320\262\320\265\321\200\320\272\320\260\320\223\320\265\320\275\320\265\321\200\320\260\321\206\320\270\320\270\320\250\320\260\320\263\320\276\320\262.feature" +++ "b/features/Core/TestDataGenerator/\320\237\321\200\320\276\320\262\320\265\321\200\320\272\320\260\320\223\320\265\320\275\320\265\321\200\320\260\321\206\320\270\320\270\320\250\320\260\320\263\320\276\320\262.feature" @@ -1,4 +1,4 @@ -# language: ru +# language: ru #parent uf: @UF5_формирование_результатов_выполнения_сценариев #parent ua: @@ -82,6 +82,7 @@ | 'Использовать' | 'Представление' | | 'Нет' | 'Регистры накопления' | И в таблице "MetadataList" я устанавливаю флаг с именем 'MetadataListUse' + И я разворачиваю группу с именем 'GroupStorageToFile' И я меняю значение переключателя с именем 'CreateFileForStorage' на 'Нет' И я нажимаю на кнопку с именем '*GenerateFeature*' И я меняю значение переключателя с именем 'StepsLanguage' на 'Английский' @@ -95,6 +96,7 @@ И я запоминаю значение поля с именем 'PathToUpload' как 'PathToUpload' Если '$PathToUpload$ = ""' Тогда + И я разворачиваю группу с именем 'GroupStorageToFile' И в поле 'Путь' я ввожу текст '111' И в поле с именем 'PathToUpload' я ввожу текст '$КаталогИнструментов$' И я перехожу к следующему реквизиту From c4997d7774312a5dcc37db40670def81955a617c Mon Sep 17 00:00:00 2001 From: Pautov Leonid Date: Sun, 24 Mar 2024 13:42:09 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=94=D0=BB=D1=8F=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=85=D0=BE=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ext/Form.xml" | 35 +++++++++++++++---- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git "a/VanessaAutomation/Forms/\320\237\320\276\320\264\320\263\320\276\321\202\320\276\320\262\320\272\320\260\320\230\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\224\320\260\320\275\320\275\321\213\321\205/Ext/Form.xml" "b/VanessaAutomation/Forms/\320\237\320\276\320\264\320\263\320\276\321\202\320\276\320\262\320\272\320\260\320\230\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\224\320\260\320\275\320\275\321\213\321\205/Ext/Form.xml" index 6ba9cc2076..23bf977e5d 100644 --- "a/VanessaAutomation/Forms/\320\237\320\276\320\264\320\263\320\276\321\202\320\276\320\262\320\272\320\260\320\230\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\224\320\260\320\275\320\275\321\213\321\205/Ext/Form.xml" +++ "b/VanessaAutomation/Forms/\320\237\320\276\320\264\320\263\320\276\321\202\320\276\320\262\320\272\320\260\320\230\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\224\320\260\320\275\320\275\321\213\321\205/Ext/Form.xml" @@ -198,7 +198,6 @@ true - Usual None false @@ -244,7 +243,6 @@ Group pages - TabsOnTop @@ -261,14 +259,12 @@ - Usual None false Vertical - Usual None false @@ -282,12 +278,20 @@ + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Выбор группы списка метаданных</v8:content> + </v8:item> <v8:item> <v8:lang>en</v8:lang> <v8:content>Metadata list group select</v8:content> </v8:item> + + ru + Выбор группы списка метаданных + en Metadata list group select @@ -310,12 +314,20 @@ + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Сортировка группы списка метаданных</v8:content> + </v8:item> <v8:item> <v8:lang>en</v8:lang> <v8:content>Metadata list group sort</v8:content> </v8:item> + + ru + Сортировка группы списка метаданных + en Metadata list group sort @@ -488,7 +500,6 @@ - Usual None false @@ -578,7 +589,6 @@ AlwaysHorizontal - Usual None false @@ -727,7 +737,6 @@ Group feature command - Usual None false @@ -912,6 +921,10 @@ + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Счетчик</v8:content> + </v8:item> <v8:item> <v8:lang>en</v8:lang> <v8:content>Count</v8:content> @@ -1413,12 +1426,20 @@ </Command> <Command name="UpdateMetadataCount" id="9"> <Title> + <v8:item> + <v8:lang>ru</v8:lang> + <v8:content>Обновить счетчик</v8:content> + </v8:item> <v8:item> <v8:lang>en</v8:lang> <v8:content>Update count</v8:content> </v8:item> + + ru + Обновить счетчик метаданных + en Update metadata count