Skip to content

Commit a4367de

Browse files
committed
Мерж #678 c веткой develop + исправление ошибки при формировании отчетов
1 parent 381ccdb commit a4367de

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1388
-197
lines changed
106 Bytes
Binary file not shown.
740 Bytes
Binary file not shown.
196 Bytes
Binary file not shown.
824 Bytes
Binary file not shown.
554 Bytes
Binary file not shown.

src/Plugins/ГенераторОтчетаAllureXML/Form/Форма/Форма.bsl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,15 @@
5151
КонецПроцедуры
5252
// } Report generator interface
5353

54+
&НаКлиенте
55+
Процедура НачатьЭкспорт(ОбработкаОповещения, Отчет, ПолныйПутьФайла) Экспорт
56+
57+
Экспортировать(Отчет, ПолныйПутьФайла);
58+
ВыполнитьОбработкуОповещения(ОбработкаОповещения);
59+
60+
КонецПроцедуры
61+
62+
5463
// { Helpers
5564
&НаСервере
5665
Функция ЭтотОбъектНаСервере()
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Form\Форма\Форма.bsl-->4e8e1a4a-a947-419b-95c8-58a411e3ffa4.0 (50, 110)
1+
Form\Форма\Форма.bsl-->4e8e1a4a-a947-419b-95c8-58a411e3ffa4.0 (50, 119)
22
Макеты\СхемаAllure.txt-->2d3462c8-c871-442e-81a7-d457064fdf0b.0

src/Plugins/ГенераторОтчетаAllureXML/und/4e8e1a4a-a947-419b-95c8-58a411e3ffa4.0

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{3,
2-
{42,0,0,0,0,1,0,0,00000000-0000-0000-0000-000000000000,1,
2+
{46,0,0,0,0,1,0,0,00000000-0000-0000-0000-000000000000,1,
33
{1,0},0,0,1,1,1,0,1,0,
44
{0,1,0},
55
{0},1,
@@ -47,7 +47,7 @@
4747
{0},0,1,0,48312c09-257f-4b29-b280-284dd89efc1e}
4848
},0,1,2,
4949
{1,
50-
{1,0},0},0,0,1,0,0,1,0,3,3},0,3,3},1,"",2,0,0,0,0,0,3,3,0,0,2},"
50+
{1,0},0},0,0,1,0,0,1,0,3,3},0,3,3},1,"",2,0,0,0,0,0,3,3,0,0,2,100,1,1,0},"
5151
// { Plugin interface
5252
&НаКлиенте
5353
Функция ОписаниеПлагина(ВозможныеТипыПлагинов) Экспорт
@@ -100,6 +100,15 @@
100100
КонецПроцедуры
101101
// } Report generator interface
102102

103+
&НаКлиенте
104+
Процедура НачатьЭкспорт(ОбработкаОповещения, Отчет, ПолныйПутьФайла) Экспорт
105+
106+
Экспортировать(Отчет, ПолныйПутьФайла);
107+
ВыполнитьОбработкуОповещения(ОбработкаОповещения);
108+
109+
КонецПроцедуры
110+
111+
103112
// { Helpers
104113
&НаСервере
105114
Функция ЭтотОбъектНаСервере()
@@ -139,7 +148,8 @@ Oi8vdjguMWMucnUvOC4xL2RhdGEvdWkiIHhtbG5zOndlYj0iaHR0cDovL3Y4LjFj
139148
LnJ1LzguMS9kYXRhL3VpL2NvbG9ycy93ZWIiIHhtbG5zOndpbj0iaHR0cDovL3Y4
140149
LjFjLnJ1LzguMS9kYXRhL3VpL2NvbG9ycy93aW5kb3dzIiB4bWxuczp4cz0iaHR0
141150
cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOnhzaT0iaHR0cDov
142-
L3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEtaW5zdGFuY2UiLz4=}
151+
L3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEtaW5zdGFuY2UiPg0KCTxvdXRwdXRQ
152+
YXJhbWV0ZXJzLz4NCjwvU2V0dGluZ3M+}
143153
},
144154
{0,0},
145155
{0,0},
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
{
2-
{216,0}
2+
{216,0,
3+
{80308,0}
4+
}
35
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{1,11,"",bdc3bba3-f8ac-4507-a33a-3cae0ba1f847,"11c5f751-bfaf-480a-92fe-7f30023f2e9a",c7e94cf4-03a6-4922-8f31-169614867285,"2d3462c8-c871-442e-81a7-d457064fdf0b",a777db5b-8171-4f65-a213-81d183d088e9,"2d3462c8-c871-442e-81a7-d457064fdf0b.0",2cc75a03-ce85-4589-b2b1-abd5ceb7549e,"4e8e1a4a-a947-419b-95c8-58a411e3ffa4",1f8bc025-a7ba-4519-bf4d-e9fe51d71fca,"4e8e1a4a-a947-419b-95c8-58a411e3ffa4.0",9ae37250-e9f2-4244-b941-32a82fc8d5d5,"908d0aaf-e4ec-4668-8d14-3e8075d222fd.0",ff463e54-3ff7-45bb-bc47-7ebd2656146c,"copyinfo",894cad72-c7e4-496f-b22d-255e48e4f2e6,"root",9c5309e1-bc94-47a7-b94a-489997dcd9da,"version",9f0ad40e-eb00-4b64-965d-e3134043c4f2,"versions",0ab69ccb-5279-47fb-82d1-d02ca5f32824}
1+
{1,11,"",16837005-6a55-48fa-8753-d1010102e534,"11c5f751-bfaf-480a-92fe-7f30023f2e9a",b9e7f5ab-c0e3-4a3f-a3ed-7f07c08548d1,"2d3462c8-c871-442e-81a7-d457064fdf0b",a777db5b-8171-4f65-a213-81d183d088e9,"2d3462c8-c871-442e-81a7-d457064fdf0b.0",2cc75a03-ce85-4589-b2b1-abd5ceb7549e,"4e8e1a4a-a947-419b-95c8-58a411e3ffa4",f4d39e50-7912-429c-a80b-b2db45b1494f,"4e8e1a4a-a947-419b-95c8-58a411e3ffa4.0",24ca01a4-f995-4129-9cd4-2498bcd5037c,"908d0aaf-e4ec-4668-8d14-3e8075d222fd.0",ff463e54-3ff7-45bb-bc47-7ebd2656146c,"copyinfo",26f4785c-5e79-4740-a5c8-319db7491084,"root",30ee5351-452d-4e82-af03-a3cbbd0ca6ac,"version",decba46b-aa9a-4c08-bd55-ca05f044d093,"versions",d072941b-e0ba-44aa-a019-c1be62b30326}

0 commit comments

Comments
 (0)