Skip to content

Commit 652f7ab

Browse files
karpovrkarpovr
committed
Merge remote-tracking branch 'origin/master'
2 parents 3844969 + 764221b commit 652f7ab

File tree

2 files changed

+75
-4
lines changed

2 files changed

+75
-4
lines changed

‎onto/common-lib-net.ttl

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1457,6 +1457,17 @@ s-wf:map_redirect_from_2_undefine
14571457
rdfs:label "redirect_from = undefine" ;
14581458
.
14591459

1460+
s-wf:map_result_decision_dateTo_2_actor_task_date_to
1461+
rdf:type v-wf:Mapping ;
1462+
v-wf:mapToVariable s-wf:var_actor_task_date_to ;
1463+
v-wf:mappingExpression """
1464+
1465+
get_properties_chain (process.getLocalVariable('result_decision'),
1466+
[{$get:'v-s:dateTo'}])
1467+
1468+
""";
1469+
rdfs:label "Новая дата срока задачи из формы решения пользователя Доработать"@ru ;
1470+
.
14601471
##########################################################################################################################################
14611472

14621473

@@ -1722,7 +1733,7 @@ s-wf:nc_to_aur a v-wf:Flow;
17221733

17231734
s-wf:nc_t2_to_r a v-wf:Flow;
17241735
rdfs:isDefinedBy s-wf:;
1725-
v-wf:predicate "task_result.is_all_executors_taken_decision ('result', newUri ('v-wf:DecisionRejected')) == true || task_result.is_all_executors_taken_decision ('result', newUri ('v-wf:DecisionNotPerformed')) == true || task_result.is_all_executors_taken_decision ('result', newUri ('v-wf:DecisionNotForMe')) == true"^^xsd:string;
1736+
v-wf:predicate "task_result.is_all_executors_taken_decision ('result', newUri ('v-wf:DecisionRejected')) == true || task_result.is_all_executors_taken_decision ('result', newUri ('v-wf:DecisionNotPerformed')) == true || task_result.is_all_executors_taken_decision ('result', newUri ('v-wf:DecisionNotForMe')) == true || task_result.is_all_executors_taken_decision ('result', newUri ('v-wf:DecisionProlongate')) == true"^^xsd:string;
17261737
v-wf:belongsTo s-wf:net_coordination;
17271738
v-wf:flowsInto s-wf:nc_return_to_initiator;
17281739
.
@@ -1797,7 +1808,7 @@ s-wf:nc_f_t1_rti a v-wf:Flow;
17971808
s-wf:nc_f_t2_oc a v-wf:Flow;
17981809
rdfs:isDefinedBy s-wf: ;
17991810
v-wf:flowsInto s-wf:nc_oc_rights;
1800-
v-wf:predicate "task_result.is_all_executors_taken_decision ('result', newUri ('v-wf:DecisionRedirect')) == false && task_result.is_all_executors_taken_decision ('result', newUri ('v-wf:DecisionRejected')) == false && task_result.is_all_executors_taken_decision ('result', newUri ('v-wf:DecisionNotPerformed')) == false && task_result.is_all_executors_taken_decision ('result', newUri ('v-wf:DecisionNotForMe')) == false && task_result.is_all_executors_taken_decision ('result', task.getInputVariable ('decision_route_to_add_reaction')) == false"^^xsd:string.
1811+
v-wf:predicate "task_result.is_all_executors_taken_decision ('result', newUri ('v-wf:DecisionRedirect')) == false && task_result.is_all_executors_taken_decision ('result', newUri ('v-wf:DecisionRejected')) == false && task_result.is_all_executors_taken_decision ('result', newUri ('v-wf:DecisionNotPerformed')) == false && task_result.is_all_executors_taken_decision ('result', newUri ('v-wf:DecisionNotForMe')) == false && task_result.is_all_executors_taken_decision ('result', newUri ('v-wf:DecisionProlongate')) == false && task_result.is_all_executors_taken_decision ('result', task.getInputVariable ('decision_route_to_add_reaction')) == false"^^xsd:string.
18011812

18021813
s-wf:nc_f_t2_t1 a v-wf:Flow;
18031814
v-wf:predicate "task_result.is_all_executors_taken_decision ('result', newUri ('v-wf:DecisionRedirect')) == true"^^xsd:string;
@@ -1931,6 +1942,12 @@ s-wf:map_rdf_type_4_TIV_documentType
19311942
v-wf:mappingExpression "task.getInputVariable ('documentType')";
19321943
rdfs:isDefinedBy s-wf: ;
19331944
.
1945+
s-wf:map_documentType_4_TIV_documentType
1946+
rdf:type v-wf:Mapping ;
1947+
v-wf:mapToVariable s-wf:var_documentType ;
1948+
v-wf:mappingExpression "process.getLocalVariable ('documentType')";
1949+
rdfs:isDefinedBy s-wf: ;
1950+
.
19341951

19351952
s-wf:map_inbox_url_4_vedaInfo_appInboxUrl
19361953
rdf:type v-wf:Mapping ;

‎onto/veda-docflow.ttl

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -885,6 +885,7 @@ v-df:rul_InstructionTransform6_0
885885
v-wf:aggregate "putUri ('v-wf:variableValue', 'v-wf:DecisionRedirect')";
886886
v-wf:aggregate "putUri ('v-wf:variableValue', 'v-wf:DecisionRejected')";
887887
v-wf:aggregate "putUri ('v-wf:variableValue', 'v-wf:DecisionNotForMe')";
888+
v-wf:aggregate "putUri ('v-wf:variableValue', 'v-wf:DecisionProlongate')";
888889
v-wf:aggregate "putString ('v-wf:variableName', 'possible_decision')";
889890
.
890891
v-df:rul_InstructionTransform6_3
@@ -1404,8 +1405,9 @@ v-wf:DecisionRemake
14041405
rdfs:isDefinedBy v-wf: ;
14051406
rdfs:label "Доработать"@ru ;
14061407
rdfs:label "Rework"@en ;
1407-
v-ui:hasTemplate v-wf:DecisionTemplate1 ;
1408+
v-ui:hasTemplate v-wf:DecisionTemplateForRemake ;
14081409
.
1410+
# v-s:dateTo
14091411

14101412
v-wf:DecisionRemaked
14111413
rdf:type owl:Class ;
@@ -1425,6 +1427,15 @@ v-wf:DecisionNotForMe
14251427
v-ui:hasTemplate v-wf:DecisionTemplate1 ;
14261428
.
14271429

1430+
v-wf:DecisionProlongate
1431+
rdf:type owl:Class ;
1432+
rdfs:subClassOf v-wf:Decision ;
1433+
rdfs:isDefinedBy v-wf: ;
1434+
rdfs:label "Прошу продлить срок"@ru ;
1435+
rdfs:label "Prolongate"@en ;
1436+
v-ui:hasTemplate v-wf:DecisionTemplate1 ;
1437+
.
1438+
14281439
v-wf:DecisionBreak
14291440
rdf:type owl:Class ;
14301441
rdfs:subClassOf v-wf:Decision ;
@@ -1567,7 +1578,6 @@ v-wf:DecisionTemplate1
15671578
v-ui:forClass v-wf:DecisionGoApproval;
15681579
v-ui:forClass v-wf:DecisionDeclined ;
15691580
v-ui:forClass v-wf:DecisionPostponed ;
1570-
v-ui:forClass v-wf:DecisionRemake ;
15711581
v-ui:forClass v-wf:DecisionRemaked ;
15721582
v-ui:forClass v-wf:DecisionNotPerformed ;
15731583
v-ui:forClass v-wf:DecisionConfirm ;
@@ -1593,6 +1603,38 @@ v-wf:DecisionTemplate1
15931603
""" ;
15941604
.
15951605

1606+
v-wf:DecisionTemplateForRemake
1607+
rdf:type v-ui:ClassTemplate ;
1608+
rdfs:isDefinedBy v-wf: ;
1609+
rdfs:label "Шаблон для класса -Решение- Доработать"@ru ;
1610+
rdfs:label "Template for -Decision- Remake class"@en ;
1611+
v-ui:forClass v-wf:DecisionRemake ;
1612+
v-ui:template """
1613+
<script>
1614+
$("#cancel.action", template).click(function () {
1615+
window.history.back();
1616+
});
1617+
</script>
1618+
<div class="row">
1619+
<div class="col-md-9">
1620+
<em about="rdfs:comment" property="rdfs:label"></em>
1621+
<div property="rdfs:comment" class="view -edit -search"></div>
1622+
<veda-control property="rdfs:comment" data-type="text" class="-view edit search"></veda-control>
1623+
</div>
1624+
<div class="col-md-3">
1625+
<em about="v-wf:dateGiven" property="rdfs:label"></em>
1626+
<div property="v-s:dateTo" class="view -edit -search"></div>
1627+
<veda-control property="v-s:dateTo" data-type="dateTime" class="-view edit search"></veda-control>
1628+
</div>
1629+
</div>
1630+
<br>
1631+
<div class="actions pull-left">
1632+
<button type="submit" class="action btn btn-primary -view edit -search" id="send">Ok</button>
1633+
<button type="button" class="action btn btn-default -view edit -search" id="cancel" about="v-s:Cancel" property="rdfs:label"/>
1634+
</div>
1635+
""" ;
1636+
.
1637+
15961638
v-wf:DecisionRedirectTemplateSpec1
15971639
rdf:type v-ui:PropertySpecification ;
15981640
rdfs:isDefinedBy v-wf: ;
@@ -1607,6 +1649,18 @@ v-wf:DecisionRedirectTemplateSpec1
16071649
v-ui:forClass v-wf:DecisionPostponed ;
16081650
v-ui:forClass v-wf:DecisionRemake ;
16091651
v-ui:forClass v-wf:DecisionNotPerformed ;
1652+
v-ui:forClass v-wf:DecisionProlongate ;
1653+
.
1654+
1655+
v-wf:DecisionRemakeTemplateSpec1
1656+
rdf:type v-ui:PropertySpecification ;
1657+
rdfs:isDefinedBy v-wf: ;
1658+
rdfs:label "Спецификация к свойству новая дата для некоторых подклассов класса -Решение-"@ru ;
1659+
rdfs:label "Spec for template for some -Decision- subclasses"@en ;
1660+
v-ui:minCardinality "1"^^xsd:integer ;
1661+
v-ui:maxCardinality "1"^^xsd:integer ;
1662+
v-ui:forProperty v-s:dateTo ;
1663+
v-ui:forClass v-wf:DecisionRemake ;
16101664
.
16111665

16121666
v-wf:DecisionRedirectTemplateSpec2

0 commit comments

Comments
 (0)