Skip to content
Snippets Groups Projects
Commit 94625ba7 authored by Sebastian Pongratz's avatar Sebastian Pongratz :ping_pong:
Browse files

#1060544-VergabeBerechtigungen Actions hinzugefügt mit Auslese

parent fd9e0160
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 144 additions and 30 deletions
entity/PermissionCalendar_entity/PermissionCalendar_entity.aod
+ 22
− 0
View file @ 94625ba7
......@@ -173,6 +173,7 @@
<entityField>
<name>permissionDealer_rowId</name>
<title>Permission Dealer</title>
<valueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_rowid/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissiondealer_rowid/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
......@@ -202,6 +203,8 @@
<name>permissionProcurer_User_RowId</name>
<title>Permission Procurer User</title>
<consumer>User</consumer>
<mandatoryProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/mandatoryProcess.js</mandatoryProcess>
<stateProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/stateProcess.js</stateProcess>
<displayValueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/onValueChange.js</onValueChange>
</entityField>
......@@ -214,8 +217,27 @@
<onActionProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewuserpermissionprocureraction/onActionProcess.js</onActionProcess>
<iconId>VAADIN:USER</iconId>
</entityActionField>
<entityActionField>
<name>addNewDepartmentPermissionProcurerAction</name>
<title>Grant new Department Permission</title>
<onActionProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewdepartmentpermissionprocureraction/onActionProcess.js</onActionProcess>
<iconId>VAADIN:GROUP</iconId>
</entityActionField>
</children>
</entityActionGroup>
<entityField>
<name>permissionProcurer_Department_RowId</name>
<title>Permission Procurer Department</title>
<consumer>Departments</consumer>
<mandatoryProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/mandatoryProcess.js</mandatoryProcess>
<stateProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/stateProcess.js</stateProcess>
<displayValueProcess>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/onValueChange.js</onValueChange>
</entityField>
<entityParameter>
<name>PermissionProcurerType_param</name>
<expose v="true" />
</entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewdepartmentpermissionprocureraction/onActionProcess.js 0 → 100644
+ 9
− 0
View file @ 94625ba7
import("KeywordRegistry_basic");
import("PermissionCalendar_lib");
import("system.vars");
import("system.neon");
var params = {};
params["PermissionProcurerType_param"] = $KeywordRegistry.permissionCalendarType$department();
params["PermissionDealer_param"] = vars.get("$param.PermissionDealer_param");
neon.openContext("PermissionCalendar", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
entity/PermissionCalendar_entity/entityfields/addactionsreverse/children/addnewuserpermissionprocureraction/onActionProcess.js
+ 2
− 2
View file @ 94625ba7
......@@ -4,6 +4,6 @@ import("system.vars");
import("system.neon");
var params = {};
params["PermissionDealerType_param"] = $KeywordRegistry.permissionCalendarType$user();
params["PermissionProcurerType_param"] = $KeywordRegistry.permissionCalendarType$user();
params["PermissionDealer_param"] = vars.get("$param.PermissionDealer_param");
neon.openContext("PermissionCalendar", "PermissionCalendarEditReverse_view", null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
neon.openContext("PermissionCalendar", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/mandatoryProcess.js
+ 1
− 1
View file @ 94625ba7
......@@ -3,7 +3,7 @@ import("system.vars");
import("system.result");
import("PermissionCalendar_lib");
if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$department())
if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$department()&& vars.getString("$param.PermissionProcurer_param"))
result.string(true);
else
result.string(false);
\ No newline at end of file
entity/PermissionCalendar_entity/entityfields/permissiondealer_department_rowid/stateProcess.js
+ 4
− 4
View file @ 94625ba7
......@@ -4,10 +4,10 @@ import("system.result");
import("PermissionCalendar_lib");
import("system.neon");
if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$department())
if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$department()&& vars.getString("$param.PermissionProcurer_param"))
if(vars.getString("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
result.string("READONLY")
result.string(neon.COMPONENTSTATE_READONLY)
else
result.string("EDITABLE");
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string("INVISIBLE");
\ No newline at end of file
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/PermissionCalendar_entity/entityfields/permissiondealer_type/valueProcess.js
+ 10
− 3
View file @ 94625ba7
import("system.neon");
import("PermissionCalendar_lib");
import("system.result");
import("system.vars");
let permissionDealerType = vars.get("$param.PermissionDealerType_param");
let permissionProcurerType = vars.get("$param.PermissionDealerType_param");
if (vars.get("$this.value") == null && permissionDealerType)
result.string(permissionDealerType);
\ No newline at end of file
if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
if (permissionProcurerType)
result.string(permissionProcurerType);
else
result.string(PermissionCalendar.getObjectType(vars.get("$param.PermissionDealer_param")));
}
\ No newline at end of file
entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/mandatoryProcess.js
+ 1
− 1
View file @ 94625ba7
......@@ -3,7 +3,7 @@ import("system.vars");
import("system.result");
import("PermissionCalendar_lib");
if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$user())
if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$user() && vars.getString("$param.PermissionProcurer_param"))
result.string(true);
else
result.string(false);
\ No newline at end of file
entity/PermissionCalendar_entity/entityfields/permissiondealer_user_rowid/stateProcess.js
+ 4
− 7
View file @ 94625ba7
......@@ -4,13 +4,10 @@ import("system.result");
import("PermissionCalendar_lib");
import("system.neon");
if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$user())
if(vars.getString("$field.PERMISSIONDEALER_TYPE") == $KeywordRegistry.permissionCalendarType$user() && vars.getString("$param.PermissionProcurer_param"))
if(vars.getString("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
result.string("READONLY");
result.string(neon.COMPONENTSTATE_READONLY)
else
if (vars.getString("$param.PermissionDealer_param"))
result.string("READONLY");
else
result.string("EDITABLE");
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string("INVISIBLE");
\ No newline at end of file
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/displayValueProcess.js 0 → 100644
+ 6
− 0
View file @ 94625ba7
import("system.vars");
import("system.result");
let display = vars.get("$field.PERMISSIONPROCURER_ROWID.displayValue");
if(display != "undefined")
result.string(vars.get("$field.PERMISSIONPROCURER_ROWID.displayValue"));
\ No newline at end of file
entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/mandatoryProcess.js 0 → 100644
+ 9
− 0
View file @ 94625ba7
import("KeywordRegistry_basic");
import("system.vars");
import("system.result");
import("PermissionCalendar_lib");
if(vars.getString("$field.PERMISSIONPROCURER_TYPE") == $KeywordRegistry.permissionCalendarType$department() && vars.getString("$param.PermissionDealer_param"))
result.string(true);
else
result.string(false);
\ No newline at end of file
entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/onValueChange.js 0 → 100644
+ 9
− 0
View file @ 94625ba7
import("KeywordRegistry_basic");
import("system.neon");
import("system.vars");
if (vars.get("$this.value") != null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
vars.set("$field.PERMISSIONPROCURER_ROWID", vars.get("$this.value"));
vars.set("$field.PERMISSIONPROCURER_TYPE", $KeywordRegistry.permissionCalendarType$department());
}
\ No newline at end of file
entity/PermissionCalendar_entity/entityfields/permissionprocurer_department_rowid/stateProcess.js 0 → 100644
+ 13
− 0
View file @ 94625ba7
import("KeywordRegistry_basic");
import("system.vars");
import("system.result");
import("PermissionCalendar_lib");
import("system.neon");
if(vars.getString("$field.PERMISSIONPROCURER_TYPE") == $KeywordRegistry.permissionCalendarType$department() && vars.getString("$param.PermissionDealer_param"))
if(vars.getString("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
result.string(neon.COMPONENTSTATE_READONLY)
else
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/PermissionCalendar_entity/entityfields/permissionprocurer_type/valueProcess.js
+ 11
− 4
View file @ 94625ba7
import("system.neon");
import("PermissionCalendar_lib");
import("Employee_lib");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$param.PermissionProcurer_param"))
result.string(PermissionCalendar.getObjectType(vars.get("$param.PermissionProcurer_param")));
\ No newline at end of file
let permissionProcurerType = vars.get("$param.PermissionProcurerType_param");
if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
if (permissionProcurerType)
result.string(permissionProcurerType);
else
result.string(PermissionCalendar.getObjectType(vars.get("$param.PermissionProcurer_param")));
}
\ No newline at end of file
entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/displayValueProcess.js
+ 4
− 7
View file @ 94625ba7
import("KeywordRegistry_basic");
import("system.result");
import("system.vars");
import("PermissionCalendar_lib");
let permissionProcurerUserDisplay = PermissionCalendar.getNameDisplay(vars.getString("$this.value"), $KeywordRegistry.permissionCalendarType$user());
import("system.result");
if (permissionProcurerUserDisplay != "undefined")
result.string(permissionProcurerUserDisplay);
let display = vars.get("$field.PERMISSIONPROCURER_ROWID.displayValue");
if(display != "undefined")
result.string(vars.get("$field.PERMISSIONPROCURER_ROWID.displayValue"));
\ No newline at end of file
entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/mandatoryProcess.js 0 → 100644
+ 9
− 0
View file @ 94625ba7
import("KeywordRegistry_basic");
import("system.vars");
import("system.result");
import("PermissionCalendar_lib");
if(vars.getString("$field.PERMISSIONPROCURER_TYPE") == $KeywordRegistry.permissionCalendarType$user() && vars.getString("$param.PermissionDealer_param"))
result.string(true);
else
result.string(false);
\ No newline at end of file
entity/PermissionCalendar_entity/entityfields/permissionprocurer_user_rowid/stateProcess.js 0 → 100644
+ 13
− 0
View file @ 94625ba7
import("KeywordRegistry_basic");
import("system.vars");
import("system.result");
import("PermissionCalendar_lib");
import("system.neon");
if(vars.getString("$field.PERMISSIONPROCURER_TYPE") == $KeywordRegistry.permissionCalendarType$user() && vars.getString("$param.PermissionDealer_param"))
if(vars.getString("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
result.string(neon.COMPONENTSTATE_READONLY)
else
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/PermissionCalendar_entity/recordcontainers/permissioncalendardb/conditionProcess.js
+ 2
− 1
View file @ 94625ba7
......@@ -9,7 +9,8 @@ let permissionDealer = vars.getString("$param.PermissionDealer_param");
var cond = new SqlBuilder();
if (permissionProcurer)
{
cond.whereIfSet("AB_PERMISSIONCALENDAR.PERMISSIONPROCURER_ROWID", EmployeeUtils.sliceUserId(permissionProcurer));
cond.whereIfSet("AB_PERMISSIONCALENDAR.PERMISSIONPROCURER_ROWID", EmployeeUtils.sliceUserId(permissionProcurer))
.orIfSet("AB_PERMISSIONCALENDAR.PERMISSIONPROCURER_ROWID", PermissionCalendar.getAllParents(permissionProcurer) , SqlBuilder.IN());
}
else if (permissionDealer)
{
......
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+ 6
− 0
View file @ 94625ba7
......@@ -6851,6 +6851,12 @@
<entry>
<key>Workflow Model</key>
</entry>
<entry>
<key>Permission Procurer Department</key>
</entry>
<entry>
<key>Grant new Department Permission</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
......
language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+ 9
− 0
View file @ 94625ba7
......@@ -8771,6 +8771,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Permission Procurer User</key>
<value>Rechteempfänger Benutzer</value>
</entry>
<entry>
<key>Grant new User Permission</key>
......@@ -8779,6 +8780,14 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>Workflow Model</key>
</entry>
<entry>
<key>Permission Procurer Department</key>
<value>Rechteempfänger Abteilung</value>
</entry>
<entry>
<key>Grant new Department Permission</key>
<value>Neue Abteilungs-Berechtigung vergeben</value>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment