Skip to content

Commit 83197e7

Browse files
theshadowcotheshadowco
committed
closes #252
Добавлена ссылка на Задачу в бизнес процессах
1 parent 3f03187 commit 83197e7

File tree

34 files changed

+171
-130
lines changed

34 files changed

+171
-130
lines changed

‎src/main/java/com/github/_1c_syntax/bsl/mdo/BusinessProcess.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,12 @@ public class BusinessProcess implements ReferenceObject {
9999
@Default
100100
MultiLanguageString explanation = MultiLanguageString.EMPTY;
101101

102+
/**
103+
* Ссылка на задачу
104+
*/
105+
@Default
106+
MdoReference task = MdoReference.EMPTY;
107+
102108
@Override
103109
public List<MD> getChildren() {
104110
return children.getOrCompute();

‎src/test/resources/fixtures/mdclasses/BusinessProcesses.БизнесПроцесс1.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
"@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/explanation"
3232
},
3333
"tabularSections": [],
34+
"task": {
35+
"type": "TASK",
36+
"mdoRef": "Task.Задача1",
37+
"mdoRefRu": "Задача.Задача1"
38+
},
3439
"templates": [],
3540
"uuid": "560a32ca-028d-4b88-b6f2-6b7212bf31f8"
3641
}}

‎src/test/resources/fixtures/mdclasses/BusinessProcesses.БизнесПроцесс1_edt.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
"@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/explanation"
3232
},
3333
"tabularSections": [],
34+
"task": {
35+
"type": "TASK",
36+
"mdoRef": "Task.Задача1",
37+
"mdoRefRu": "Задача.Задача1"
38+
},
3439
"templates": [],
3540
"uuid": "560a32ca-028d-4b88-b6f2-6b7212bf31f8"
3641
}}

‎src/test/resources/fixtures/mdclasses/Catalogs.Справочник1.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -633,22 +633,22 @@
633633
},
634634
"modules": [
635635
{
636-
"moduleType": "ObjectModule",
637-
"uri": "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Ext/ObjectModule.bin",
636+
"moduleType": "ManagerModule",
637+
"uri": "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Ext/ManagerModule.bsl",
638638
"owner": {
639639
"@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/owner"
640640
},
641641
"supportVariant": "NONE",
642-
"isProtected": true
642+
"isProtected": false
643643
},
644644
{
645-
"moduleType": "ManagerModule",
646-
"uri": "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Ext/ManagerModule.bsl",
645+
"moduleType": "ObjectModule",
646+
"uri": "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Ext/ObjectModule.bin",
647647
"owner": {
648648
"@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/owner"
649649
},
650650
"supportVariant": "NONE",
651-
"isProtected": false
651+
"isProtected": true
652652
}
653653
],
654654
"name": "Справочник1",

‎src/test/resources/fixtures/mdclasses/Catalogs.Справочник1_edt.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -633,22 +633,22 @@
633633
},
634634
"modules": [
635635
{
636-
"moduleType": "ObjectModule",
637-
"uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/ObjectModule.bsl",
636+
"moduleType": "ManagerModule",
637+
"uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/ManagerModule.bsl",
638638
"owner": {
639639
"@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/owner"
640640
},
641641
"supportVariant": "NONE",
642-
"isProtected": true
642+
"isProtected": false
643643
},
644644
{
645-
"moduleType": "ManagerModule",
646-
"uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/ManagerModule.bsl",
645+
"moduleType": "ObjectModule",
646+
"uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/ObjectModule.bsl",
647647
"owner": {
648648
"@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/owner"
649649
},
650650
"supportVariant": "NONE",
651-
"isProtected": false
651+
"isProtected": true
652652
}
653653
],
654654
"name": "Справочник1",

‎src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.ПланВидовХарактеристик1.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
},
1616
"modules": [
1717
{
18-
"moduleType": "ObjectModule",
19-
"uri": "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/Ext/ObjectModule.bsl",
18+
"moduleType": "ManagerModule",
19+
"uri": "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/Ext/ManagerModule.bsl",
2020
"owner": {
2121
"@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/mdoReference"
2222
},
2323
"supportVariant": "NONE",
2424
"isProtected": false
2525
},
2626
{
27-
"moduleType": "ManagerModule",
28-
"uri": "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/Ext/ManagerModule.bsl",
27+
"moduleType": "ObjectModule",
28+
"uri": "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/Ext/ObjectModule.bsl",
2929
"owner": {
3030
"@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/mdoReference"
3131
},

‎src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.ПланВидовХарактеристик1_edt.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
},
1616
"modules": [
1717
{
18-
"moduleType": "ObjectModule",
19-
"uri": "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/ObjectModule.bsl",
18+
"moduleType": "ManagerModule",
19+
"uri": "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/ManagerModule.bsl",
2020
"owner": {
2121
"@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/mdoReference"
2222
},
2323
"supportVariant": "NONE",
2424
"isProtected": false
2525
},
2626
{
27-
"moduleType": "ManagerModule",
28-
"uri": "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/ManagerModule.bsl",
27+
"moduleType": "ObjectModule",
28+
"uri": "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/ObjectModule.bsl",
2929
"owner": {
3030
"@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/mdoReference"
3131
},

‎src/test/resources/fixtures/mdclasses/Configuration.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,11 @@
242242
"templates": [],
243243
"explanation": {
244244
"@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym"
245+
},
246+
"task": {
247+
"type": "TASK",
248+
"mdoRef": "Task.Задача1",
249+
"mdoRefRu": "Задача.Задача1"
245250
}
246251
}
247252
],
@@ -1593,9 +1598,7 @@
15931598
"uuid": "c251fcec-ec02-4ef4-8f70-4d70db6631ea",
15941599
"name": "Задача1",
15951600
"mdoReference": {
1596-
"type": "TASK",
1597-
"mdoRef": "Task.Задача1",
1598-
"mdoRefRu": "Задача.Задача1"
1601+
"@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/task"
15991602
},
16001603
"objectBelonging": "OWN",
16011604
"comment": "",
@@ -1629,7 +1632,7 @@
16291632
},
16301633
"supportVariant": "NONE",
16311634
"owner": {
1632-
"@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/tasks/com.github._1c_syntax.bsl.mdo.Task/mdoReference"
1635+
"@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/task"
16331636
},
16341637
"passwordMode": false,
16351638
"kind": "CUSTOM",

‎src/test/resources/fixtures/mdclasses/Configuration_edt.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,11 @@
242242
"templates": [],
243243
"explanation": {
244244
"@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym"
245+
},
246+
"task": {
247+
"type": "TASK",
248+
"mdoRef": "Task.Задача1",
249+
"mdoRefRu": "Задача.Задача1"
245250
}
246251
}
247252
],
@@ -1568,9 +1573,7 @@
15681573
"uuid": "c251fcec-ec02-4ef4-8f70-4d70db6631ea",
15691574
"name": "Задача1",
15701575
"mdoReference": {
1571-
"type": "TASK",
1572-
"mdoRef": "Task.Задача1",
1573-
"mdoRefRu": "Задача.Задача1"
1576+
"@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/task"
15741577
},
15751578
"objectBelonging": "OWN",
15761579
"comment": "",
@@ -1604,7 +1607,7 @@
16041607
},
16051608
"supportVariant": "NONE",
16061609
"owner": {
1607-
"@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/tasks/com.github._1c_syntax.bsl.mdo.Task/mdoReference"
1610+
"@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/businessProcesses/com.github._1c_syntax.bsl.mdo.BusinessProcess/task"
16081611
},
16091612
"passwordMode": false,
16101613
"kind": "CUSTOM",

‎src/test/resources/fixtures/mdclasses/Constants.Константа1.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
},
1313
"modules": [
1414
{
15-
"moduleType": "ValueManagerModule",
16-
"uri": "src/test/resources/ext/designer/mdclasses/src/cf/Constants/Константа1/Ext/ValueManagerModule.bsl",
15+
"moduleType": "ManagerModule",
16+
"uri": "src/test/resources/ext/designer/mdclasses/src/cf/Constants/Константа1/Ext/ManagerModule.bsl",
1717
"owner": {
1818
"@reference": "/com.github._1c_syntax.bsl.mdo.Constant/mdoReference"
1919
},
2020
"supportVariant": "NONE",
2121
"isProtected": false
2222
},
2323
{
24-
"moduleType": "ManagerModule",
25-
"uri": "src/test/resources/ext/designer/mdclasses/src/cf/Constants/Константа1/Ext/ManagerModule.bsl",
24+
"moduleType": "ValueManagerModule",
25+
"uri": "src/test/resources/ext/designer/mdclasses/src/cf/Constants/Константа1/Ext/ValueManagerModule.bsl",
2626
"owner": {
2727
"@reference": "/com.github._1c_syntax.bsl.mdo.Constant/mdoReference"
2828
},

0 commit comments

Comments
 (0)