diff --git a/Braga/Braga.adl b/Braga/Braga.adl index 2364c552..4ca8269d 100644 --- a/Braga/Braga.adl +++ b/Braga/Braga.adl @@ -266,7 +266,7 @@ VIOLATION (TXT "{EX} DelPair;isaStar;Concept;", SRC I, TXT ";Concept;", TGT I) ENDPROCESS -INTERFACE "DomainAnaylsis" FOR User : '_SESSION' +INTERFACE "DomainAnaylsis" FOR User : "_SESSION" TABS[ relations : V[SESSION*Relation] BOX [ relation : I diff --git a/CP23/CP23 Interfaces.oldadl b/CP23/CP23 Interfaces.oldadl index 33a3a692..228c85fa 100644 --- a/CP23/CP23 Interfaces.oldadl +++ b/CP23/CP23 Interfaces.oldadl @@ -13,12 +13,12 @@ sessionEmployee :: SESSION * Employee [UNI] sessionOrgRole :: SESSION * OrganizationalRole [UNI] sessionEqtType :: SESSION * EquipmentType [UNI] -INTERFACE SESSION (sessionEmployee, sessionOrgRole) : V[ONE*SESSION];'_SESSION' +INTERFACE SESSION (sessionEmployee, sessionOrgRole) : V[ONE*SESSION];"_SESSION" BOX[ "Employee" : sessionEmployee , "Org. Roles" : sessionOrgRole ] -INTERFACE Select (sessionEmployee, sessionOrgRole, sessionEqtType) : I[SESSION];'_SESSION'[SESSION] +INTERFACE Select (sessionEmployee, sessionOrgRole, sessionEqtType) : I[SESSION];"_SESSION"[SESSION] BOX[ "Employee" : sessionEmployee , "Org.Role" : sessionOrgRole , "Eqt.Type" : sessionEqtType @@ -29,7 +29,7 @@ BOX[ "Employee" : sessionEmployee INTERFACE "EqtIssuer: Overview" (sessionEmployee, sessionEqtType) FOR HRMOfficer : I[ONE] BOX[ "Employees" : V[ONE*Employee] BOX[ "ID" : I , "Status":emplStatus ] , "Eqt.Types" : V[ONE*EqtType] -- BOX[ "ID" : I , "Status":eqtTypeStatus ] - , "Select" : V[ONE*SESSION];'_SESSION'[SESSION] INTERFACE Select + , "Select" : V[ONE*SESSION];"_SESSION"[SESSION] INTERFACE Select ] INTERFACE "EqtIssuer: Employee" (emplIssuedEqt, eqtStatus) : I[Employee] @@ -77,7 +77,7 @@ INTERFACE "EqtIssuer: Equipment" (eqtKind, eqtMake, eqtType, eqtSerial, eqtStatu INTERFACE "HRM: Overview" (sessionEmployee, sessionOrgRole) FOR HRMOfficer : I[ONE] BOX[ "Org. Roles" : V[ONE*OrganizationalRole] , "Employees" : V[ONE*Employee] BOX[ "ID" : I , "Status":emplStatus ] - , "Select" : V[ONE*SESSION];'_SESSION'[SESSION] INTERFACE Select + , "Select" : V[ONE*SESSION];"_SESSION"[SESSION] INTERFACE Select ] INTERFACE "HRM: Employee" (emplName, emplManager, emplOrgRole) @@ -102,7 +102,7 @@ BOX[ "Org. Role" : I --[Employees]-- -- Employees may add/remove devices they own, and modify the status of any equipment issued to, or owned by them. -INTERFACE "Empl: Overview" (sessionEmployee, emplOwnsEqt, eqtKind, eqtMake, eqtType, eqtSerial, eqtStatus) FOR Employee : V[ONE*SESSION];'_SESSION'[SESSION] +INTERFACE "Empl: Overview" (sessionEmployee, emplOwnsEqt, eqtKind, eqtMake, eqtType, eqtSerial, eqtStatus) FOR Employee : V[ONE*SESSION];"_SESSION"[SESSION] BOX[ "Select" : I INTERFACE Select , "Employee" : sessionEmployee BOX[ "Name" : emplName diff --git a/Contract Management/Cases.adl b/Contract Management/Cases.adl index fcb0bcfb..6b399439 100644 --- a/Contract Management/Cases.adl +++ b/Contract Management/Cases.adl @@ -9,7 +9,7 @@ PURPOSE PATTERN "Case Management" {+This pattern contains some basic administration for cases. +} PATTERN "Case Management" - RULE caseAuthor : V[Case*SESSION];'_SESSION';sessionAccount |- owner;V + RULE caseAuthor : V[Case*SESSION];"_SESSION";sessionAccount |- owner;V -- MEANING "The default/initial owner of a case is the actor that created it." VIOLATION ( TXT "{EX} InsPair;owner;Case;", SRC I, TXT ";Actor;" , TGT I , TXT "{EX} InsPair;created;Case;", SRC I, TXT ";Moment;{php}date(DATE_ISO8601)" -- Current date in ISO 8601 date format diff --git a/Contract Management/CvM.adl b/Contract Management/CvM.adl index c0dba33e..12d98885 100644 --- a/Contract Management/CvM.adl +++ b/Contract Management/CvM.adl @@ -106,14 +106,14 @@ PATTERN Arguments {-The following code depends on a login mechanism. Revive when it is active - RULE sessionAuthor : (I[TText]#'_SESSION'[SESSION]);ingelogd |- madeBy;V + RULE sessionAuthor : (I[TText]#"_SESSION"[SESSION]);ingelogd |- madeBy;V MEANING "Every statement must must be stated by someone. If not, the application will assign the user of the current session as the person who made the statement." VIOLATION ( TXT "{EX} InsPair;madeBy;TText;", SRC I, TXT ";Actor;" , TGT I , TXT "{EX} InsPair;observed;TText;", SRC I, TXT ";Moment;{php}date(DATE_ISO8601)" -- Current date in ISO 8601 date format ) ROLE ExecEngine MAINTAINS sessionAuthor - RULE caseAuthor : V[Scope*SESSION];'_SESSION';ingelogd |- owner;V + RULE caseAuthor : V[Scope*SESSION];"_SESSION";ingelogd |- owner;V MEANING "Every case must have an owner. If not, the application will assign the user of the current session as the initial owner." VIOLATION ( TXT "{EX} InsPair;owner;Scope;", SRC I, TXT ";Actor;" , TGT I , TXT "{EX} InsPair;created;Scope;", SRC I, TXT ";Moment;{php}date(DATE_ISO8601)" -- Current date in ISO 8601 date format @@ -173,7 +173,7 @@ PURPOSE PATTERN "Case Management" {+This pattern contains some basic administration for cases. +} PATTERN "Case Management" - RULE caseAuthor : V[Case*SESSION];'_SESSION';sessionAccount |- owner;V + RULE caseAuthor : V[Case*SESSION];"_SESSION";sessionAccount |- owner;V -- MEANING "The default/initial owner of a case is the actor that created it." VIOLATION ( TXT "{EX} InsPair;owner;Case;", SRC I, TXT ";Actor;" , TGT I , TXT "{EX} InsPair;created;Case;", SRC I, TXT ";Moment;{php}date(DATE_ISO8601)" -- Current date in ISO 8601 date format diff --git a/Contract Management/include/templates/views/ShrSeatManagement.html b/Contract Management/include/templates/views/ShrSeatManagement.html index ebdc8e42..b8e7a6d4 100644 --- a/Contract Management/include/templates/views/ShrSeatManagement.html +++ b/Contract Management/include/templates/views/ShrSeatManagement.html @@ -3,11 +3,11 @@ { "shrName" : shrName , "shrDescr" : shrDescr , "shrAccUserid" : shrAcc;accUserid -, "userIsShr" : I /\ V;'_SESSION';sessionAccount;shrAcc~ +, "userIsShr" : I /\ V;"_SESSION";sessionAccount;shrAcc~ , "shrLeaveSeatReq" : shrLeaveSeatReq , "shrIsFree" : I - (shrAcc;shrAcc~) , "shrClaimSeatReq" : shrClaimSeatReq -, "shrIsOccupiedBySomeoneElse" : I /\ V;'_SESSION';sessionAccount;-shrAcc~ +, "shrIsOccupiedBySomeoneElse" : I /\ V;"_SESSION";sessionAccount;-shrAcc~ } HTML TEMPLATE "UETP-ShrSeatManagement.html" ENDVIEW -->
diff --git a/Delivery/Delivery.adl b/Delivery/Delivery.adl index f039b33c..733aec16 100644 --- a/Delivery/Delivery.adl +++ b/Delivery/Delivery.adl @@ -1,7 +1,7 @@ CONTEXT Delivery IN DUTCH INCLUDE "Delivery.xlsx" -INTERFACE Overview : '_SESSION' +INTERFACE Overview : "_SESSION" TABS[ "Clients" : V[SESSION*Client] COLS[ Client: I , "from~ (order)" : from~ COLS["order number":I[Order], provider:addressedTo] @@ -58,7 +58,7 @@ INTERFACE "Accept orders" (accepted) FOR Provider : I[Order] , "paid by" : of~;delivery~;paid~ ] -INTERFACE Bestellijst : '_SESSION' +INTERFACE Bestellijst : "_SESSION" COLS[ "list item" : V[SESSION*Delivery] COLS[ provider : provider , client : deliveredto diff --git a/Delivery/DeliveryAccounts.adl b/Delivery/DeliveryAccounts.adl index 5b754927..9c57f3d1 100644 --- a/Delivery/DeliveryAccounts.adl +++ b/Delivery/DeliveryAccounts.adl @@ -27,7 +27,7 @@ IDENT AccountNamen: Account(userid[Account*Userid]) ENDPATTERN ----------------------------------------------------------- -- INTERFACE (in de menu balk) die overzicht geeft van bestaande accounts: -INTERFACE Accounts : '_SESSION' +INTERFACE Accounts : "_SESSION" BOX [ account : V[SESSION*Account];userid ] -- INTERFACE die je moet gebruiken om nieuwe Entiteiten mee te maken: @@ -53,7 +53,7 @@ ROLE User MAINTAINS "wachtwoord invullen" ENDPROCESS ----------------------------------------------------------- -- INTERFACE voor het proceswerklijstje horend bij "wachtwoord invullen" -INTERFACE "In te vullen wachtwoorden" : '_SESSION' -- +INTERFACE "In te vullen wachtwoorden" : "_SESSION" -- BOX[ Accounts : V[SESSION*Account];(I /\ -(password;V));userid ] ----------------------------------------------------------- ENDCONTEXT \ No newline at end of file diff --git a/Doosjes/Counters.adl b/Doosjes/Counters.adl index aa577d8a..d253d910 100644 --- a/Doosjes/Counters.adl +++ b/Doosjes/Counters.adl @@ -97,7 +97,7 @@ VIOLATION (TXT "{EX} Increment;portSeqNr;Port;", TGT I, TXT ";Integer;", SRC cou ENDPROCESS -INTERFACE "Counters" FOR Developer: '_SESSION'[SESSION]#I[Counter] +INTERFACE "Counters" FOR Developer: "_SESSION"[SESSION]#I[Counter] COLS[ "Counter" : I , "Scope" : counterScope , "Name" : counterName diff --git a/Doosjes/Developer.ifc b/Doosjes/Developer.ifc index 62a0c0d5..4bda5184 100644 --- a/Doosjes/Developer.ifc +++ b/Doosjes/Developer.ifc @@ -27,7 +27,7 @@ sCpCompFrom :: SESSION * Scope [UNI] --[Scopes]-- -INTERFACE "Scopes" FOR Developer: '_SESSION';V[SESSION*Scope] +INTERFACE "Scopes" FOR Developer: "_SESSION";V[SESSION*Scope] BOX [ "ID" : I , "Part of" : scopeIPO , "Copy of" : scopeICO @@ -84,7 +84,7 @@ INTERFACE "Port" FOR Developer: I[Port] ] --[Constants]-- -INTERFACE "Constants" FOR Developer: '_SESSION';V[SESSION*Constant] +INTERFACE "Constants" FOR Developer: "_SESSION";V[SESSION*Constant] BOX [ "Name" : constName , "Part of" : constScope , "Copy of" : constICO @@ -105,7 +105,7 @@ INTERFACE "Constant" (constName, constType, constValue) FOR Developer: I[Constan --[Wires]-- -INTERFACE "Wires" (wScope, wICO, wSrc, wTgt) FOR Developer: '_SESSION';V[SESSION*Wire] +INTERFACE "Wires" (wScope, wICO, wSrc, wTgt) FOR Developer: "_SESSION";V[SESSION*Wire] BOX [ "ID" : I , "Part of (scope)" : wScope -- , "Source (portRef)" : I @@ -126,7 +126,7 @@ INTERFACE "Wire" (wScope, wICO, wSrc, wTgt) FOR Developer: I[Wire] --[Projects]-- -INTERFACE "Projects" (sNwProject) FOR Developer: '_SESSION'[SESSION] +INTERFACE "Projects" (sNwProject) FOR Developer: "_SESSION"[SESSION] ROWS[ "New project" : sNwProject , "Existing projects" : V[SESSION*Project] BOX [ "ID" : I @@ -158,7 +158,7 @@ INTERFACE "Project" INTERFACE "Applications" (sNwNamedApp, sCpAppName, sCpAppFrom - ) FOR Developer, Engineer: '_SESSION'[SESSION] + ) FOR Developer, Engineer: "_SESSION"[SESSION] ROWS[ "New (from scratch)" : sNwNamedApp , "New (from template)" : I COLS[ "Name": sCpAppName @@ -179,7 +179,7 @@ INTERFACE "Applications" INTERFACE "Components" (sNwNamedComp, sCpCompName, sCpCompFrom - ) FOR Developer, Manufacturer: '_SESSION'[SESSION] + ) FOR Developer, Manufacturer: "_SESSION"[SESSION] ROWS[ "New (from scratch)" : sNwNamedComp , "New (from template)" : I COLS[ "Name": sCpCompName diff --git a/Doosjes/ScopeEditingSvc.adl b/Doosjes/ScopeEditingSvc.adl index 68372125..a85e6952 100644 --- a/Doosjes/ScopeEditingSvc.adl +++ b/Doosjes/ScopeEditingSvc.adl @@ -9,7 +9,7 @@ PURPOSE PROCESS "Scope Editing Service" sNwProject :: SESSION * ProjectName [UNI] ROLE ExecEngine MAINTAINS "Create a new Project" SERVICE ScopeEditingSvc MAINTAINS "Create a new Project" -RULE "Create a new Project": '_SESSION';sNwProject |- -V +RULE "Create a new Project": "_SESSION";sNwProject |- -V VIOLATION (TXT "{EX} NewStruct;Project" ,TXT ";projName;Project;_NEW;ProjectName;", TGT I --! ,TXT ";projOrg;Project;_NEW;Organization;", SRC sessionOrg @@ -45,7 +45,7 @@ VIOLATION (TXT "{EX} NewStruct;Scope" sNwNamedApp :: SESSION * ScopeName [UNI] ROLE ExecEngine MAINTAINS "Create new (named) application in session" SERVICE ScopeEditingSvc MAINTAINS "Create new (named) application in session" -RULE "Create new (named) application in session": '_SESSION';sNwNamedApp |- -V +RULE "Create new (named) application in session": "_SESSION";sNwNamedApp |- -V VIOLATION (TXT "{EX} NewStruct;Scope" ,TXT ";scopeName;Scope;_NEW;ScopeName;", TGT I --! ,TXT ";scopeOrg;Scope;_NEW;Organization;", SRC sessionOrg @@ -57,7 +57,7 @@ sCpAppFrom :: SESSION * Scope [UNI] ROLE ExecEngine MAINTAINS "Create a new (named) application that is a copy of an existing one" SERVICE ScopeEditingSvc MAINTAINS "Create a new (named) application that is a copy of an existing one" RULE "Create a new (named) application that is a copy of an existing one": - '_SESSION' /\ sCpAppName;V;(I-scopeIsComponent);sCpAppFrom~ |- -V + "_SESSION" /\ sCpAppName;V;(I-scopeIsComponent);sCpAppFrom~ |- -V VIOLATION (TXT "{EX} NewStruct;Scope" ,TXT ";scopeName;Scope;_NEW;ScopeName;", SRC sCpAppName ,TXT ";scopeICO;Scope;_NEW;Scope;", SRC sCpAppFrom @@ -71,7 +71,7 @@ VIOLATION (TXT "{EX} NewStruct;Scope" sNwNamedComp :: SESSION * ScopeName [UNI] ROLE ExecEngine MAINTAINS "Create new (named) component in session" SERVICE ScopeEditingSvc MAINTAINS "Create new (named) component in session" -RULE "Create new (named) component in session": '_SESSION';sNwNamedComp |- -V +RULE "Create new (named) component in session": "_SESSION";sNwNamedComp |- -V VIOLATION (TXT "{EX} NewStruct;Scope" ,TXT ";scopeName;Scope;_NEW;ScopeName;", TGT I ,TXT ";scopeIsComponent;Scope;_NEW;Scope;_NEW" @@ -84,7 +84,7 @@ sCpCompFrom :: SESSION * Scope [UNI] ROLE ExecEngine MAINTAINS "Create a new (named) component that is a copy of an existing one" SERVICE ScopeEditingSvc MAINTAINS "Create a new (named) component that is a copy of an existing one" RULE "Create a new (named) component that is a copy of an existing one": - '_SESSION' /\ sCpCompName;V;scopeIsComponent;sCpCompFrom~ |- -V + "_SESSION" /\ sCpCompName;V;scopeIsComponent;sCpCompFrom~ |- -V VIOLATION (TXT "{EX} NewStruct;Scope" ,TXT ";scopeName;Scope;_NEW;ScopeName;", SRC sCpCompName ,TXT ";scopeICO;Scope;_NEW;Scope;", SRC sCpCompFrom diff --git a/EURent/EURent Customer.ifc b/EURent/EURent Customer.ifc index f6c36a52..b63227c9 100644 --- a/EURent/EURent Customer.ifc +++ b/EURent/EURent Customer.ifc @@ -31,7 +31,7 @@ At the highest level, we distinguish between Anonymous and Customer sessions allow the user to create, or continue the creation of a rental. In order to submit a rental request, anonymous users need to register or login to make them 'own' the rental. +} -INTERFACE "Customer Car Rentals" : '_SESSION'[SESSION] cRud BOX +INTERFACE "Customer Car Rentals" : "_SESSION"[SESSION] cRud BOX [ "Anonymous sessions" : (I-(sessionAccount;sessionAccount~)) cRud BOX [ "If there is no current rental" : I-(sessionStartRC;sessionStartRC~) cRud BOX -- Show 'button' if there is no current rental case [ "Login or Register" : I-(sessionAccount;sessionAccount~) {-cRud-} INTERFACE "Login/Register" @@ -52,7 +52,7 @@ INTERFACE "Customer Car Rentals" : '_SESSION'[SESSION] cRud BOX , "property" : sessionRCCreateReq cRUd -- this argument MUST be a [PROP]-relation and the Update flag MUST be set. ] ] - , "List customer rentals" : '_SESSION';sessionAccount + , "List customer rentals" : "_SESSION";sessionAccount ;(accPersonRef;(rcRenter\/rcDriver)~ \/ rcAuthorAcc~) {-cRud-} INTERFACE "View Rental Cases" ] @@ -76,7 +76,7 @@ INTERFACE "Customer Car Rentals" : '_SESSION'[SESSION] cRud BOX POPULATION IfcMsg CONTAINS [ "You must be logged in as a customer to use this interface." ] POPULATION IfcMsg CONTAINS [ " | " ] -INTERFACE "Edit unpromised car rental" : '_SESSION' /\ sessionStartRC;(I-rentalHasBeenPromised);sessionStartRC~ cRud BOX -- If we have an unpromised current rental case +INTERFACE "Edit unpromised car rental" : "_SESSION" /\ sessionStartRC;(I-rentalHasBeenPromised);sessionStartRC~ cRud BOX -- If we have an unpromised current rental case [ "Login or Register" : I-(sessionAccount;sessionAccount~) {-cRud-} INTERFACE "Login/Register" , "Customer" : sessionStartRC {-cRud-} INTERFACE "Edit Customer Details" , "Rental" : sessionStartRC {-cRud-} INTERFACE "Edit Contract Details" @@ -90,15 +90,15 @@ INTERFACE "Edit unpromised car rental" : '_SESSION' /\ sessionStartRC;(I-rentalH ] --[Login and Registration for Customers (and Developers)]-- -INTERFACE "Login/Register": '_SESSION'[SESSION] cRud BOX - [ "Login": '_SESSION'-(sessionAccount;sessionAccount~) cRud BOX +INTERFACE "Login/Register": "_SESSION"[SESSION] cRud BOX + [ "Login": "_SESSION"-(sessionAccount;sessionAccount~) cRud BOX [ "Login": I cRud BOX [ "Userid": loginUserid cRUd , "Password": loginPassword crUd -- crUd is needed for Passwords ] ] --$Login support for demonstrations and/or development - , "Request LoginAssist" {- FOR Developer -}: '_SESSION'-sessionLoginAssist cRud BOX + , "Request LoginAssist" {- FOR Developer -}: "_SESSION"-sessionLoginAssist cRud BOX [ "Show accounts to login with": I BOX [ property : sessionLoginAssist cRUd ] , " ": sessionLoginAssist;(V-(V;I[Customer];V));'Cannot help - there are no Customer-accounts'[LoginMessage] cRud ] @@ -112,13 +112,13 @@ INTERFACE "Login/Register": '_SESSION'[SESSION] cRud BOX ] ] --$End of login support for demonstrations and/or development - , "Registration": ('_SESSION'-(sessionAccount;sessionAccount~))-sessionLoginAssist cRud BOX + , "Registration": ("_SESSION"-(sessionAccount;sessionAccount~))-sessionLoginAssist cRud BOX [ "Register": I cRud BOX [ "Userid" : loginUserid cRUd , "Password" : registerPassword crUd -- crUd is needed for Passwords , "Your (full) name" : sessionPersonRef cRUd , "Register" : I BOX - [ disabled : '_SESSION' - -- The button is disabled when we have a session without + [ disabled : "_SESSION" - -- The button is disabled when we have a session without ( loginUserid;loginUserid~ -- a specified userid /\ registerPassword;registerPassword~ -- a specified password /\ sessionPersonRef;sessionPersonRef~ -- and a specified user's name. @@ -138,8 +138,8 @@ POPULATION LoginMessage CONTAINS [ "Cannot help - there are no Customer-accounts ROLE ExecEngine MAINTAINS "Remember the most recently used driving-license of a customer" RULE "Remember the most recently used driving-license of a customer": - (I[Customer] /\ sessionAccount~;'_SESSION';sessionStartRC;rcDriver;accPersonRef~) - ;sessionAccount~;'_SESSION';sessionStartRC;rcDrivingLicense + (I[Customer] /\ sessionAccount~;"_SESSION";sessionStartRC;rcDriver;accPersonRef~) + ;sessionAccount~;"_SESSION";sessionStartRC;rcDrivingLicense |- custDrivingLicense VIOLATION (TXT "{EX} InsPair;custDrivingLicense;Customer;", SRC I, TXT ";DrivingLicense;", TGT I) diff --git a/EURent/EURent Developer.ifc b/EURent/EURent Developer.ifc index 87bd1223..3816bd61 100644 --- a/EURent/EURent Developer.ifc +++ b/EURent/EURent Developer.ifc @@ -1,7 +1,7 @@ CONTEXT EURentInterfaces IN ENGLISH ------------------------------------------------------------ -INTERFACE "OVERVIEW" FOR Developer : '_SESSION'[SESSION] cRud +INTERFACE "OVERVIEW" FOR Developer : "_SESSION"[SESSION] cRud TABS[ "Session Context" : I cRud BOX[ "For user": I cRud COLS[ "New rental request": sessionStartRC CRud diff --git a/EURent/EURent Employee.ifc b/EURent/EURent Employee.ifc index 4e7d8518..dd7b2b62 100644 --- a/EURent/EURent Employee.ifc +++ b/EURent/EURent Employee.ifc @@ -16,7 +16,7 @@ Some of these tabs/activities have a common structure (again using ), co and a property that allows them to be selected as the 'current' record in the session' - a box that allows manipulating the record (and deselecting it as the 'current' record) +} -INTERFACE "EU-Rent Branch Office": '_SESSION' cRud BOX +INTERFACE "EU-Rent Branch Office": "_SESSION" cRud BOX [ "Branch-related Sessions": I /\ sessionBranch;sessionBranch~ cRud TABS [ "My Session" : I cRud BOX [ "Header and Button Bar": I cRud BOX @@ -91,15 +91,15 @@ INTERFACE "EU-Rent Branch Office": '_SESSION' cRud BOX POPULATION IfcMsg CONTAINS [ "You must login as an EURent employee to use this interface" ] --[Login for Employees (and Developers)]------------------- -INTERFACE "Login as EURent employee": '_SESSION'[SESSION] cRud BOX - [ "Login": '_SESSION'-(sessionAccount;sessionAccount~) cRud BOX +INTERFACE "Login as EURent employee": "_SESSION"[SESSION] cRud BOX + [ "Login": "_SESSION"-(sessionAccount;sessionAccount~) cRud BOX [ "Login": I cRud BOX [ "Userid": loginUserid cRUd , "Password": loginPassword crUd -- crUd is needed for Passwords ] ] --$Login support for demonstrations and/or development - , "Request LoginAssist" {- FOR Developer -}: '_SESSION'-sessionLoginAssist cRud BOX + , "Request LoginAssist" {- FOR Developer -}: "_SESSION"-sessionLoginAssist cRud BOX [ "Show accounts to login with": I BOX [ property : sessionLoginAssist cRUd ] , " ": sessionLoginAssist;(V-(V;I[Employee];V));'Cannot help - there are no Employee-accounts'[LoginMessage] cRud ] @@ -198,7 +198,7 @@ ROLE ExecEngine MAINTAINS "Default start date of rental" RULE "Default start date of rental": (I-(rcStartDate;rcStartDate~)) ;sessionStartRC~ - ;'_SESSION';(I /\ sessionBranch;sessionBranch~) + ;"_SESSION";(I /\ sessionBranch;sessionBranch~) ;sessionToday |- rcStartDate MEANING "The value of the start date of a rental handled in a branch office session defaults to todays date." VIOLATION (TXT "{EX} InsPair;rcStartDate;RentalCase;", SRC I, TXT ";Date;", TGT I) @@ -223,7 +223,7 @@ PURPOSE RULE "Car keys must be handed to the driver (and registered)" ROLE Employee MAINTAINS "Car keys must be handed to the driver (and registered)" RULE "Car keys must be handed to the driver (and registered)": I[RentalCase] - /\ (rcPickupBranch;sessionBranch~;'_SESSION';sessionStartRC) + /\ (rcPickupBranch;sessionBranch~;"_SESSION";sessionStartRC) /\ (rentalHasBeenPromised-rentalCarHasBeenPickedUp) /\ (rcAssignedCar;carAvailableAt;rcPickupBranch~) |- rcKeysHandedOver @@ -262,7 +262,7 @@ PURPOSE RULE "Registration of car drop-off branch" +} ROLE ExecEngine MAINTAINS "Registration of car drop-off branch" RULE "Registration of car drop-off branch": - (rentalCarHasBeenPickedUp-rentalCarHasBeenDroppedOff);sessionStopRC~;'_SESSION';sessionBranch |- rcDroppedOffBranch + (rentalCarHasBeenPickedUp-rentalCarHasBeenDroppedOff);sessionStopRC~;"_SESSION";sessionBranch |- rcDroppedOffBranch MEANING "The rental case of a drop-off is the one that has not ended and where the car is presented for drop-off" VIOLATION (TXT "{EX} InsPair;rcDroppedOffBranch;RentalCase;", SRC I, TXT ";Branch;", TGT I) @@ -270,7 +270,7 @@ PURPOSE RULE "Registration of car drop-off date" {+When a car is returned to a branch, that date is the drop-off date.+} ROLE ExecEngine MAINTAINS "Registration of car drop-off date" RULE "Registration of car drop-off date": - (rentalCarHasBeenPickedUp-rentalCarHasBeenDroppedOff);sessionStopRC~;'_SESSION';sessionToday |- rcDroppedOffDate + (rentalCarHasBeenPickedUp-rentalCarHasBeenDroppedOff);sessionStopRC~;"_SESSION";sessionToday |- rcDroppedOffDate MEANING "The (actual) drop-off date is the date at which the car is presented for drop-off at a branch." VIOLATION (TXT "{EX} InsPair;rcDroppedOffDate;RentalCase;", SRC I, TXT ";Date;", TGT I) diff --git a/EURent/EURent Interface procs.adl b/EURent/EURent Interface procs.adl index 71169db5..e102e1e4 100644 --- a/EURent/EURent Interface procs.adl +++ b/EURent/EURent Interface procs.adl @@ -63,7 +63,7 @@ RELATION sessionDrivingLicense[SESSION*DrivingLicense] [UNI] -- Search input: th RELATION rcStartSelectReq[RentalCase*RentalCase] [PROP] -- Request for the making a RentalCase 'current', that is in the startup phase. ROLE ExecEngine MAINTAINS "Handle rcStartSelectReq if it is valid" RULE "Handle rcStartSelectReq if it is valid": - '_SESSION'[SESSION];V;(rcStartSelectReq-rentalHasBeenStarted) |- sessionStartRC;(I-rcStartSelectReq) + "_SESSION"[SESSION];V;(rcStartSelectReq-rentalHasBeenStarted) |- sessionStartRC;(I-rcStartSelectReq) VIOLATION (TXT "{EX} InsPair;sessionStartRC;SESSION;", SRC I, TXT ";RentalCase;", TGT I ,TXT "{EX} DelPair;rcStartSelectReq;RentalCase;", TGT I, TXT ";RentalCase;", TGT I ,TXT "{EX} DelPair;sessionCustomerRef;SESSION;", SRC I, TXT ";PersonRef;", SRC sessionCustomerRef @@ -71,7 +71,7 @@ VIOLATION (TXT "{EX} InsPair;sessionStartRC;SESSION;", SRC I, TXT ";RentalCase;" ) ROLE ExecEngine MAINTAINS "Clear rcStartSelectReq if it is invalid" RULE "Clear rcStartSelectReq if it is invalid": - '_SESSION'[SESSION];V;(rcStartSelectReq /\ rentalHasBeenStarted) |- -V + "_SESSION"[SESSION];V;(rcStartSelectReq /\ rentalHasBeenStarted) |- -V VIOLATION (TXT "{EX} DelPair;rcStartSelectReq;RentalCase;", TGT I, TXT ";RentalCase;", TGT I ,TXT "{EX} DelPair;sessionCustomerRef;SESSION;", SRC I, TXT ";PersonRef;", SRC sessionCustomerRef ,TXT "{EX} DelPair;sessionDrivingLicense;SESSION;", SRC I, TXT ";DrivingLicense;", SRC sessionDrivingLicense @@ -81,21 +81,21 @@ VIOLATION (TXT "{EX} DelPair;rcStartSelectReq;RentalCase;", TGT I, TXT ";RentalC RELATION sessionRCDelReq[SESSION*SESSION] [PROP] -- This property can be set from an INTERFACE ROLE ExecEngine MAINTAINS "Deselect a 'starting' rental case as the current case in a session" RULE "Deselect a 'starting' rental case as the current case in a session": - '_SESSION';sessionRCDelReq /\ sessionStartRC;sessionStartRC~ |- -V + "_SESSION";sessionRCDelReq /\ sessionStartRC;sessionStartRC~ |- -V VIOLATION (TXT "{EX} DelPair;sessionStartRC;SESSION;", SRC I, TXT ";RentalCase;", TGT I ,TXT "{EX} DelPair;sessionRCDelReq;SESSION;", SRC I, TXT ";SESSION;", SRC I ) ROLE ExecEngine MAINTAINS "Clear sessionStartRC in Customer sessions" RULE "Clear sessionStartRC in Customer sessions": - ('_SESSION' /\ sessionAccount;I[Customer];sessionAccount~);sessionStartRC |- sessionStartRC;(I-rentalHasBeenPromised) + ("_SESSION" /\ sessionAccount;I[Customer];sessionAccount~);sessionStartRC |- sessionStartRC;(I-rentalHasBeenPromised) VIOLATION (TXT "{EX} DelPair;sessionStartRC;SESSION;", SRC I, TXT ";RentalCase;", TGT I ,TXT "{EX} DelPair;sessionRCDelReq;SESSION;", SRC I, TXT ";SESSION;", SRC I ) ROLE ExecEngine MAINTAINS "Clear sessionStartRC" RULE "Clear sessionStartRC": - '_SESSION';sessionStartRC |- sessionStartRC;(I-rentalHasBeenStarted) + "_SESSION";sessionStartRC |- sessionStartRC;(I-rentalHasBeenStarted) VIOLATION (TXT "{EX} DelPair;sessionStartRC;SESSION;", SRC I, TXT ";RentalCase;", TGT I ,TXT "{EX} DelPair;sessionRCDelReq;SESSION;", SRC I, TXT ";SESSION;", SRC I ) @@ -110,7 +110,7 @@ RELATION sessionDrivingLicense[SESSION*DrivingLicense] [UNI] -- Search input: th RELATION rcStopSelectReq[RentalCase*RentalCase] [PROP] -- Request for the making a RentalCase 'current', that is in the drop-off phase. ROLE ExecEngine MAINTAINS "Handle rcStopSelectReq if it is valid" RULE "Handle rcStopSelectReq if it is valid": - '_SESSION'[SESSION];V;(rcStopSelectReq /\ (rentalHasBeenStarted-rentalHasBeenEnded)) |- sessionStopRC;(I-rcStopSelectReq) + "_SESSION"[SESSION];V;(rcStopSelectReq /\ (rentalHasBeenStarted-rentalHasBeenEnded)) |- sessionStopRC;(I-rcStopSelectReq) VIOLATION (TXT "{EX} InsPair;sessionStopRC;SESSION;", SRC I, TXT ";RentalCase;", TGT I ,TXT "{EX} DelPair;rcStopSelectReq;RentalCase;", TGT I, TXT ";RentalCase;", TGT I ,TXT "{EX} DelPair;sessionCarID;SESSION;", SRC I, TXT ";LicensePlate;", SRC sessionCarID @@ -119,7 +119,7 @@ VIOLATION (TXT "{EX} InsPair;sessionStopRC;SESSION;", SRC I, TXT ";RentalCase;", ) ROLE ExecEngine MAINTAINS "Clear rcStopSelectReq if it is invalid" RULE "Clear rcStopSelectReq if it is invalid": - '_SESSION'[SESSION];V;(rcStopSelectReq - (rentalHasBeenStarted-rentalHasBeenEnded)) |- -V + "_SESSION"[SESSION];V;(rcStopSelectReq - (rentalHasBeenStarted-rentalHasBeenEnded)) |- -V VIOLATION (TXT "{EX} DelPair;rcStopSelectReq;RentalCase;", TGT I, TXT ";RentalCase;", TGT I ,TXT "{EX} DelPair;sessionCarID;SESSION;", SRC I, TXT ";LicensePlate;", SRC sessionCarID ,TXT "{EX} DelPair;sessionCustomerRef;SESSION;", SRC I, TXT ";PersonRef;", SRC sessionCustomerRef @@ -130,14 +130,14 @@ VIOLATION (TXT "{EX} DelPair;rcStopSelectReq;RentalCase;", TGT I, TXT ";RentalCa RELATION sessionRCDelReq[SESSION*SESSION] [PROP] -- This property can be set from an INTERFACE ROLE ExecEngine MAINTAINS "Deselect a 'drop-off' rental case as the current case in a session" RULE "Deselect a 'drop-off' rental case as the current case in a session": - '_SESSION';sessionRCDelReq /\ sessionStopRC;sessionStopRC~ |- -V + "_SESSION";sessionRCDelReq /\ sessionStopRC;sessionStopRC~ |- -V VIOLATION (TXT "{EX} DelPair;sessionStopRC;SESSION;", SRC I, TXT ";RentalCase;", TGT I ,TXT "{EX} DelPair;sessionRCDelReq;SESSION;", SRC I, TXT ";SESSION;", SRC I ) ROLE ExecEngine MAINTAINS "Clear sessionStopRC" RULE "Clear sessionStopRC": - '_SESSION';sessionStopRC |- sessionStopRC;(I-rentalHasBeenEnded) + "_SESSION";sessionStopRC |- sessionStopRC;(I-rentalHasBeenEnded) VIOLATION (TXT "{EX} DelPair;sessionStopRC;SESSION;", SRC I, TXT ";RentalCase;", TGT I ,TXT "{EX} DelPair;sessionRCDelReq;SESSION;", SRC I, TXT ";SESSION;", SRC I ) @@ -181,7 +181,7 @@ RELATION rcSig[RentalCase*RentalCase] [PROP] -- Use RentalCase signalling only i {- ROLE ExecEngine MAINTAINS "InsPair rcSig" RULE "InsPair rcSig": -- see https://github.com/AmpersandTarski/Ampersand/issues/579) - I[RentalCase] /\ V;'_SESSION';(V[SESSION*Branch]-sessionBranch);V /\ + I[RentalCase] /\ V;"_SESSION";(V[SESSION*Branch]-sessionBranch);V /\ ( rcDrivingLicense;rcDrivingLicense~ \/ rcPickupBranch;rcPickupBranch~ \/ rcDropOffBranch;rcDropOffBranch~ @@ -194,7 +194,7 @@ VIOLATION (TXT "{EX} InsPair;rcSig;RentalCase;", SRC I, TXT ";RentalCase;", TGT ROLE ExecEngine MAINTAINS "DelPair rcSig" RULE "DelPair rcSig": -- see https://github.com/AmpersandTarski/Ampersand/issues/579) rcSig -|- I[RentalCase] /\ V;'_SESSION';(V[SESSION*Branch]-sessionBranch);V /\ +|- I[RentalCase] /\ V;"_SESSION";(V[SESSION*Branch]-sessionBranch);V /\ ( rcDrivingLicense;rcDrivingLicense~ \/ rcPickupBranch;rcPickupBranch~ \/ rcDropOffBranch;rcDropOffBranch~ diff --git a/EURent/EURent Interfaces.adl b/EURent/EURent Interfaces.adl index 6f299589..bdcc1852 100644 --- a/EURent/EURent Interfaces.adl +++ b/EURent/EURent Interfaces.adl @@ -17,11 +17,11 @@ MEANING "For demo purposes the date of today may initially be set to a fixed val RULE "There may be at most one value in 'todaysDate'": todaysDate;V;todaysDate |- I ROLE ExecEngine MAINTAINS "There must be at least one value in 'todaysDate'" -RULE "There must be at least one value in 'todaysDate'": '_SESSION'[SESSION] |- V;todaysDate;V +RULE "There must be at least one value in 'todaysDate'": "_SESSION"[SESSION] |- V;todaysDate;V VIOLATION (TXT "{EX} InsPair;todaysDate;Date;{php}date('d-m-Y');Date;{php}date('d-m-Y')") ROLE ExecEngine MAINTAINS "Initialize todays date" -RULE "Initialize todays date": ('_SESSION'-(sessionToday;sessionToday~));V;todaysDate |- sessionToday +RULE "Initialize todays date": ("_SESSION"-(sessionToday;sessionToday~));V;todaysDate |- sessionToday VIOLATION (TXT "{EX} InsPair;sessionToday;SESSION;", SRC I, TXT ";Date;", TGT I) ENDPROCESS @@ -143,11 +143,11 @@ INTERFACE "Edit Customer Details": I[RentalCase] cRud BOX [ "* Driver" : rcDriver cRUd , "* Driving license" : rcDrivingLicense cRUd ] - , "Renter details in Customer sessions": I /\ V;'_SESSION';sessionAccount;V[Customer*RentalCase] cRud BOX + , "Renter details in Customer sessions": I /\ V;"_SESSION";sessionAccount;V[Customer*RentalCase] cRud BOX [ "Renter" : rcRenter cRud ] - , "Renter details in Employee sessions": I /\ V;'_SESSION';sessionAccount;V[Employee*RentalCase] cRud BOX + , "Renter details in Employee sessions": I /\ V;"_SESSION";sessionAccount;V[Employee*RentalCase] cRud BOX [ "Renter" : rcRenter cRUd ] - , "Renter details in Anonymous sessions": I /\ V;'_SESSION';sessionAccount;V[Employee*RentalCase] cRud BOX + , "Renter details in Anonymous sessions": I /\ V;"_SESSION";sessionAccount;V[Employee*RentalCase] cRud BOX [ "You must login or register to become (or change) the renter" : I-I cRud ] ] ----------------------------------------------------------- @@ -167,12 +167,12 @@ INTERFACE "Show Car Details" : I[Car] cRud BOX ----------------------------------------------------------- --[Car Assignment, Car Pickup]-- INTERFACE "Car Assignment and Pickup": I[RentalCase] cRud BOX - [ "Available Types" : V;'_SESSION';sessionBranch;carAvailableAt~;carType cRud COLS + [ "Available Types" : V;"_SESSION";sessionBranch;carAvailableAt~;carType cRud COLS [ "Type" : I cRud , "Tariff" : rentalTariffPerDay cRud ] , "Selected Type" : rcCarType cRUd - , "Available cars" : rcCarType;carType~ /\ V;'_SESSION';sessionBranch;carAvailableAt~ cRud + , "Available cars" : rcCarType;carType~ /\ V;"_SESSION";sessionBranch;carAvailableAt~ cRud , "Selected car" : rcAssignedCar cRUd , "Keys are handed over": I BOX [ property : rcKeysHandedOver cRUd ] ] diff --git a/EURent/EURent NavBar.adl b/EURent/EURent NavBar.adl index 07a7cec8..c8889483 100644 --- a/EURent/EURent NavBar.adl +++ b/EURent/EURent NavBar.adl @@ -4,7 +4,7 @@ --[For Testing purposes]-- VIEW Menus: Menu(menuLabel) -INTERFACE "NavBar": '_SESSION';sessionNavBarMenu cRud BOX +INTERFACE "NavBar": "_SESSION";sessionNavBarMenu cRud BOX [ "Menus": miIsPartOf~ cRud BOX [ "Weight" : miWeight cRud , "Label" : miLabel cRud @@ -88,11 +88,11 @@ VIOLATION (TXT "{EX} DelAtom;Menu;", SRC I) POPULATION miWeight[MenuItem*Weight] CONTAINS [ ("Interfacename", 0) ] ROLE ExecEngine MAINTAINS "NavBar: Insert 'Interfacename'" RULE "NavBar: Insert 'Interfacename'": - 'Interfacename'[MenuItem];V;('_SESSION' /\ somecondition);sessionNavBarMenu |- miIsPartOf + 'Interfacename'[MenuItem];V;("_SESSION" /\ somecondition);sessionNavBarMenu |- miIsPartOf VIOLATION (TXT "{EX} InsPair;miIsPartOf;MenuItem;", SRC I, TXT ";Menu;", TGT I) ROLE ExecEngine MAINTAINS "NavBar: Remove 'Interfacename'" RULE "NavBar: Remove 'Interfacename'": - 'Interfacename'[MenuItem];miIsPartOf;sessionNavBarMenu~ |- V;('_SESSION' /\ somecondition) + 'Interfacename'[MenuItem];miIsPartOf;sessionNavBarMenu~ |- V;("_SESSION" /\ somecondition) VIOLATION (TXT "{EX} DelPair;miIsPartOf;MenuItem;", SRC I, TXT ";Menu;", TGT I) -} @@ -103,13 +103,13 @@ VIOLATION (TXT "{EX} DelAtom;Menu;", SRC I) ROLE ExecEngine MAINTAINS "NavBar: Insert 'Customer Car Rentals'" RULE "NavBar: Insert 'Customer Car Rentals'": 'Customer Car Rentals'[MenuItem] - ;V;('_SESSION'-(sessionAccount;I[Employee];sessionAccount~)) -- all sessions except Employee-sessions + ;V;("_SESSION"-(sessionAccount;I[Employee];sessionAccount~)) -- all sessions except Employee-sessions ;sessionNavBarMenu |- miIsPartOf VIOLATION (TXT "{EX} InsPair;miIsPartOf;MenuItem;", SRC I, TXT ";Menu;", TGT I) ROLE ExecEngine MAINTAINS "NavBar: Remove 'Customer Car Rentals'" RULE "NavBar: Remove 'Customer Car Rentals'": - 'Customer Car Rentals'[MenuItem];miIsPartOf;(I /\ sessionNavBarMenu~;'_SESSION';sessionNavBarMenu) - |- V;('_SESSION'-(sessionAccount;I[Employee];sessionAccount~));sessionNavBarMenu + 'Customer Car Rentals'[MenuItem];miIsPartOf;(I /\ sessionNavBarMenu~;"_SESSION";sessionNavBarMenu) + |- V;("_SESSION"-(sessionAccount;I[Employee];sessionAccount~));sessionNavBarMenu VIOLATION (TXT "{EX} DelPair;miIsPartOf;MenuItem;", SRC I, TXT ";Menu;", TGT I) --$(De)populating the NavBar with 'EU-Rent Branch Office' @@ -119,13 +119,13 @@ VIOLATION (TXT "{EX} DelAtom;Menu;", SRC I) ROLE ExecEngine MAINTAINS "NavBar: Insert 'EU-Rent Branch Office'" RULE "NavBar: Insert 'EU-Rent Branch Office'": 'EU-Rent Branch Office'[MenuItem] - ;V;('_SESSION' /\ sessionAccount;I[Employee];sessionAccount~) -- all sessions except Employee-sessions + ;V;("_SESSION" /\ sessionAccount;I[Employee];sessionAccount~) -- all sessions except Employee-sessions ;sessionNavBarMenu |- miIsPartOf VIOLATION (TXT "{EX} InsPair;miIsPartOf;MenuItem;", SRC I, TXT ";Menu;", TGT I) ROLE ExecEngine MAINTAINS "NavBar: Remove 'EU-Rent Branch Office'" RULE "NavBar: Remove 'EU-Rent Branch Office'": - 'EU-Rent Branch Office'[MenuItem];miIsPartOf;(I /\ sessionNavBarMenu~;'_SESSION';sessionNavBarMenu) - |- V;('_SESSION' /\ sessionAccount;I[Employee];sessionAccount~);sessionNavBarMenu + 'EU-Rent Branch Office'[MenuItem];miIsPartOf;(I /\ sessionNavBarMenu~;"_SESSION";sessionNavBarMenu) + |- V;("_SESSION" /\ sessionAccount;I[Employee];sessionAccount~);sessionNavBarMenu VIOLATION (TXT "{EX} DelPair;miIsPartOf;MenuItem;", SRC I, TXT ";Menu;", TGT I) --$(De)populating the NavBar with 'Login' @@ -134,12 +134,12 @@ VIOLATION (TXT "{EX} DelAtom;Menu;", SRC I) POPULATION miWeight[MenuItem*Weight] CONTAINS [ ("Login", 2) ] ROLE ExecEngine MAINTAINS "NavBar: Insert 'Login'" RULE "NavBar: Insert 'Login'": - 'Login'[MenuItem];V;('_SESSION'-(sessionAccount;sessionAccount~));sessionNavBarMenu |- miIsPartOf + 'Login'[MenuItem];V;("_SESSION"-(sessionAccount;sessionAccount~));sessionNavBarMenu |- miIsPartOf VIOLATION (TXT "{EX} InsPair;miIsPartOf;MenuItem;", SRC I, TXT ";Menu;", TGT I) ROLE ExecEngine MAINTAINS "NavBar: Remove 'Login'" RULE "NavBar: Remove 'Login'": - 'Login'[MenuItem];miIsPartOf;(I /\ sessionNavBarMenu~;'_SESSION';sessionNavBarMenu) - |- V;('_SESSION'-(sessionAccount;sessionAccount~));sessionNavBarMenu + 'Login'[MenuItem];miIsPartOf;(I /\ sessionNavBarMenu~;"_SESSION";sessionNavBarMenu) + |- V;("_SESSION"-(sessionAccount;sessionAccount~));sessionNavBarMenu VIOLATION (TXT "{EX} DelPair;miIsPartOf;MenuItem;", SRC I, TXT ";Menu;", TGT I) --$(De)populating the NavBar with 'Register' @@ -148,12 +148,12 @@ VIOLATION (TXT "{EX} DelAtom;Menu;", SRC I) POPULATION miWeight[MenuItem*Weight] CONTAINS [ ("Register", 3) ] ROLE ExecEngine MAINTAINS "NavBar: Insert 'Register'" RULE "NavBar: Insert 'Register'": - 'Register'[MenuItem];V;('_SESSION'-(sessionAccount;sessionAccount~));sessionNavBarMenu |- miIsPartOf + 'Register'[MenuItem];V;("_SESSION"-(sessionAccount;sessionAccount~));sessionNavBarMenu |- miIsPartOf VIOLATION (TXT "{EX} InsPair;miIsPartOf;MenuItem;", SRC I, TXT ";Menu;", TGT I) ROLE ExecEngine MAINTAINS "NavBar: Remove 'Register'" RULE "NavBar: Remove 'Register'": - 'Register'[MenuItem];miIsPartOf;(I /\ sessionNavBarMenu~;'_SESSION';sessionNavBarMenu) - |- V;('_SESSION'-(sessionAccount;sessionAccount~));sessionNavBarMenu + 'Register'[MenuItem];miIsPartOf;(I /\ sessionNavBarMenu~;"_SESSION";sessionNavBarMenu) + |- V;("_SESSION"-(sessionAccount;sessionAccount~));sessionNavBarMenu VIOLATION (TXT "{EX} DelPair;miIsPartOf;MenuItem;", SRC I, TXT ";Menu;", TGT I) --$(De)populating the NavBar with 'Logout' @@ -162,12 +162,12 @@ VIOLATION (TXT "{EX} DelAtom;Menu;", SRC I) POPULATION miWeight[MenuItem*Weight] CONTAINS [ ("Logout", 2) ] ROLE ExecEngine MAINTAINS "NavBar: Insert 'Logout'" RULE "NavBar: Insert 'Logout'": - 'Logout'[MenuItem];V;('_SESSION' /\ sessionAccount;sessionAccount~);sessionNavBarMenu |- miIsPartOf + 'Logout'[MenuItem];V;("_SESSION" /\ sessionAccount;sessionAccount~);sessionNavBarMenu |- miIsPartOf VIOLATION (TXT "{EX} InsPair;miIsPartOf;MenuItem;", SRC I, TXT ";Menu;", TGT I) ROLE ExecEngine MAINTAINS "NavBar: Remove 'Logout'" RULE "NavBar: Remove 'Logout'": - 'Logout'[MenuItem];miIsPartOf;(I /\ sessionNavBarMenu~;'_SESSION';sessionNavBarMenu) - |- V;('_SESSION' /\ sessionAccount;sessionAccount~);sessionNavBarMenu + 'Logout'[MenuItem];miIsPartOf;(I /\ sessionNavBarMenu~;"_SESSION";sessionNavBarMenu) + |- V;("_SESSION" /\ sessionAccount;sessionAccount~);sessionNavBarMenu VIOLATION (TXT "{EX} DelPair;miIsPartOf;MenuItem;", SRC I, TXT ";Menu;", TGT I) diff --git a/EURent/EURent SIAM Module.adl b/EURent/EURent SIAM Module.adl index 7e3cfb3d..77dfe045 100644 --- a/EURent/EURent SIAM Module.adl +++ b/EURent/EURent SIAM Module.adl @@ -31,8 +31,8 @@ VIOLATION (TXT "The SIAM Module files that you have INCLUDEd have major version --[[Examples of possibly useful VIEWs]]-- VIEW Sessions: SESSION DEFAULT { "text": (I-(sessionAccount;sessionAccount~));V;'Welcome'[IfcMsg] - , "user": '_SESSION';sessionAccount;accPersonRef - , "employee" : '_SESSION';sessionAccount;I[Employee];V;' (EURent employee)'[IfcMsg] + , "user": "_SESSION";sessionAccount;accPersonRef + , "employee" : "_SESSION";sessionAccount;I[Employee];V;' (EURent employee)'[IfcMsg] } ENDVIEW POPULATION IfcMsg CONTAINS [ "Welcome" ] POPULATION IfcMsg CONTAINS [ " (EURent employee)" ] @@ -68,7 +68,7 @@ Note: setting the property `accIsActive` will automatically also set `accIsIniti --[[Logout interface]]-- {- We may no longer need this interface because we can logout with buttongs now. -INTERFACE "Logout": '_SESSION'[SESSION] cRud BOX +INTERFACE "Logout": "_SESSION"[SESSION] cRud BOX [ "Authenticated user sessions": I /\ sessionAccount;sessionAccount~ cRud BOX [ "Logout" : I BOX [ property : logoutRequest cRUd ] , "UserID": sessionUserid cRud diff --git a/EURent/EURent SIAMv3 module.adl b/EURent/EURent SIAMv3 module.adl index b479d9b0..f880b5e9 100644 --- a/EURent/EURent SIAMv3 module.adl +++ b/EURent/EURent SIAMv3 module.adl @@ -37,8 +37,8 @@ VIOLATION (TXT "The SIAM Module files that you have INCLUDEd have major version --[[Examples of possibly useful VIEWs]]-- -- The following VIEW replaces 'dirty' SESSION identifiers with the text "My Session" or "Some other Session" VIEW Sessions: SESSION DEFAULT - { "uid": '_SESSION'[SESSION];V;'My Session'[LoginMessage] - \/ (I[SESSION]-'_SESSION');V;'Some other Session'[LoginMessage] + { "uid": "_SESSION"[SESSION];V;"My Session"[LoginMessage] + \/ (I[SESSION]-"_SESSION");V;"Some other Session"[LoginMessage] } ENDVIEW POPULATION LoginMessage CONTAINS [ "My Session", "Some other Session" ] --} @@ -60,7 +60,7 @@ VIOLATION (TXT "The SIAM Module files that you have INCLUDEd have major version --[[Logout interface]]-- {- We may no longer need this interface because we can logout with buttongs now. -INTERFACE "Logout": '_SESSION'[SESSION] cRud BOX +INTERFACE "Logout": "_SESSION"[SESSION] cRud BOX [ "Authenticated user sessions": I /\ sessionAccount;sessionAccount~ cRud BOX [ "Logout" : I BOX [ property : logoutRequest cRUd ] , "UserID": sessionUserid cRud diff --git a/Generics/GenericDateTime.adl b/Generics/GenericDateTime.adl index ad1574a2..3b706d23 100644 --- a/Generics/GenericDateTime.adl +++ b/Generics/GenericDateTime.adl @@ -30,7 +30,7 @@ ENDPROCESS sessionDateTimes :: SESSION * DateTime selectedDateTime :: SESSION * DateTime [UNI] -INTERFACE "Session Dates and Times" (selectedDateTime) : V[ONE*SESSION];'_SESSION'[SESSION] +INTERFACE "Session Dates and Times" (selectedDateTime) : V[ONE*SESSION];"_SESSION"[SESSION] BOX[ "Enter a DateTime" : I BOX [ "DateTime" : selectedDateTime , "Standard output" : selectedDateTime;stdDateTime diff --git a/Generics/GenericSessionAccounts.adl b/Generics/GenericSessionAccounts.adl index acc5e9cc..095d0267 100644 --- a/Generics/GenericSessionAccounts.adl +++ b/Generics/GenericSessionAccounts.adl @@ -26,7 +26,7 @@ ENDPROCESS CONCEPT SESSION "een verzameling van attributen die hoort bij de webbrowser/user die van een applicatie gebruikt maakt." PURPOSE CONCEPT SESSION -{+Als meerdere gebruikers een enkele applicatie willen benaderen dan moet de communicatie die deze applicatie heeft met de verschillende gebruikers onderscheiden kunnen worden naar de gebruiker. De singleton '_SESSION' wordt hiervoor gebruikt.+} +{+Als meerdere gebruikers een enkele applicatie willen benaderen dan moet de communicatie die deze applicatie heeft met de verschillende gebruikers onderscheiden kunnen worden naar de gebruiker. De singleton "_SESSION" wordt hiervoor gebruikt.+} sessionUserid :: SESSION * Userid [UNI] sessionPassword :: SESSION * Password [UNI] @@ -65,7 +65,7 @@ accOldPassword :: Account * Password [UNI] -- niet echt nodig, maar zo lijkt het accNewPassword :: Account * Password [UNI] -- nodig om binnen een sessie wachtwoorden te kunnen veranderen ROLE ExecEngine MAINTAINS "Wachtwoord wijzigen" RULE "Wachtwoord wijzigen": -'_SESSION'[SESSION];sessionAccount;(I /\ accPassword;accOldPassword~);accNewPassword +"_SESSION"[SESSION];sessionAccount;(I /\ accPassword;accOldPassword~);accNewPassword |- sessionAccount;accPassword VIOLATION (TXT "{EX} InsPair;sessionPassword;SESSION;", SRC I, TXT ";Password;", TGT I ,TXT "{EX} InsPair;accPassword;Account;", SRC sessionAccount, TXT ";Password;", TGT I @@ -80,7 +80,7 @@ VIOLATION (TXT "{EX} Login;", SRC I) -} ENDPROCESS ------------------------------------------------------------ -INTERFACE "Login" (sessionUserid,sessionPassword): V[ONE*SESSION];'_SESSION'[SESSION] +INTERFACE "Login" (sessionUserid,sessionPassword): V[ONE*SESSION];"_SESSION"[SESSION] BOX[ "Userid" : sessionUserid , "Password" : sessionPassword , "Account" : sessionAccount -- Hier verschijnt de DisplayName @@ -90,7 +90,7 @@ BOX[ "Userid" : sessionUserid INTERFACE "Change Password" -- I[Account] ( accOldPassword , accNewPassword - ) : I[Account] /\ sessionAccount~;'_SESSION'[SESSION];V[SESSION*Account] + ) : I[Account] /\ sessionAccount~;"_SESSION"[SESSION];V[SESSION*Account] BOX[ "Account" : I -- Hier verschijnt de DisplayName , "Userid" : accUserid , "Old Password": accOldPassword diff --git a/Generics/Generics.adl b/Generics/Generics.adl index 11e43ff2..75b56587 100644 --- a/Generics/Generics.adl +++ b/Generics/Generics.adl @@ -27,7 +27,7 @@ INTERFACE "Verstuur bericht" , sendEmailMessage , personSMSaddress , sendSMSMessage - ) : V[ONE*SESSION];'_SESSION'[SESSION] + ) : V[ONE*SESSION];"_SESSION"[SESSION] BOX[ "Aan " : (I /\ sessionAccount;sessionAccount~) -- alleen als er is ingelogd ;(V[SESSION*Actor] /\ -(sessionAccount;accActor)) -- naar iedereen, behalve jezelf ] diff --git a/Hawaii/Hawaii.adl b/Hawaii/Hawaii.adl index 0f73ddea..9a27f1aa 100644 --- a/Hawaii/Hawaii.adl +++ b/Hawaii/Hawaii.adl @@ -34,7 +34,7 @@ VIOLATION (TXT "Student ", SRC I, TXT " cannot go to ", TGT I, TXT " without pas POPULATION Destination CONTAINS [ "Amsterdam" ] -INTERFACE Overview : '_SESSION' cRud +INTERFACE Overview : "_SESSION" cRud TABS [ Students : V[SESSION*Student] cRuD COLS [ "Student" : I[Student] cRud , "passed" : pass~ CRUD diff --git a/HelloWorld/HelloWorld.adl b/HelloWorld/HelloWorld.adl index 37bd5836..daf41daa 100644 --- a/HelloWorld/HelloWorld.adl +++ b/HelloWorld/HelloWorld.adl @@ -11,7 +11,7 @@ RELATION sessionGreeting[SESSION*Greeting] [UNI] MEANING "Every session has a text for greeting its user." ROLE User MAINTAINS "Please specify your name" -RULE "Please specify your name": '_SESSION'[SESSION] |- sessionUserName;sessionUserName~ +RULE "Please specify your name": "_SESSION"[SESSION] |- sessionUserName;sessionUserName~ VIOLATION (TXT "You can use the 'Registration' interface to do so.") RELATION sessionUsedName[SESSION*UserName] [UNI] @@ -33,7 +33,7 @@ VIOLATION (TXT "{EX} InsPair;sessionGreeting;SESSION;", SRC I ,TXT ";Greeting;He VIEW SESSIONs: SESSION(TXT "Hello, World") -INTERFACE Registration FOR User: '_SESSION'[SESSION] cRud BOX +INTERFACE Registration FOR User: "_SESSION"[SESSION] cRud BOX [ "hidden row 1" : I /\ sessionUserName;sessionUserName~ cRud ROWS [ "My name is" : sessionUserName cRUd ] diff --git a/ISTAR/GenericDataTypes.adl b/ISTAR/GenericDataTypes.adl index 8a380b57..aa2636d3 100644 --- a/ISTAR/GenericDataTypes.adl +++ b/ISTAR/GenericDataTypes.adl @@ -15,12 +15,12 @@ MESSAGE "You may only specify 'Yes' or 'No' as an answer." CONCEPT SESSION "a representation of the webbrowser/user that uses an application through some communications link." PURPOSE CONCEPT SESSION IN ENGLISH -{+Whenever multiple users want to access a single application, the communication that such users (webclients) have with the application must be kept apart from one another. The singleton '_SESSION' is used for that; this singleton is defined (and implemented) by the prototype generator.+} +{+Whenever multiple users want to access a single application, the communication that such users (webclients) have with the application must be kept apart from one another. The singleton "_SESSION" is used for that; this singleton is defined (and implemented) by the prototype generator.+} sessionUserid :: SESSION * Userid [UNI] sessionPassword :: SESSION * Password [UNI] -RULE "Login": '_SESSION'[SESSION];sessionUserid;accUserid~ |- '_SESSION';sessionPassword;accPassword~ +RULE "Login": "_SESSION"[SESSION];sessionUserid;accUserid~ |- "_SESSION";sessionPassword;accPassword~ MEANING "A registered (Userid,Password) combination must be provided when logging in." MESSAGE "Incorrect (or empty) password" diff --git a/ISTAR/GenericDataTypes.ifc b/ISTAR/GenericDataTypes.ifc index 4c73e6a3..7b2afb0e 100644 --- a/ISTAR/GenericDataTypes.ifc +++ b/ISTAR/GenericDataTypes.ifc @@ -1,6 +1,6 @@ CONTEXT GenericInterfaces IN DUTCH ----------------------------------------------------------- -INTERFACE Login (sessionUserid,sessionPassword) FOR SupportedUnit,Plans,Ops,SubUnit,ASIC : V[ONE*SESSION];'_SESSION'[SESSION] +INTERFACE Login (sessionUserid,sessionPassword) FOR SupportedUnit,Plans,Ops,SubUnit,ASIC : V[ONE*SESSION];"_SESSION"[SESSION] BOX [ userid : sessionUserid , password : sessionPassword , actor : (sessionUserid;accUserid~ /\ sessionPassword;accPassword~) INTERFACE "View Account" diff --git a/ISTAR/ISTAR-Workshop.ifc b/ISTAR/ISTAR-Workshop.ifc index 15393058..1bbccd38 100644 --- a/ISTAR/ISTAR-Workshop.ifc +++ b/ISTAR/ISTAR-Workshop.ifc @@ -102,7 +102,7 @@ BOX[ "Intel Requirement" : I ------------------------------------------------------------ INTERFACE "Overview (SupportedUnit)" FOR SupportedUnit : I[ONE] BOX[ "Orders" : - -- V[ONE*Order]; (I /\ V[Order*SESSION];'_SESSION';(sessionUserid;accUserid~ /\ sessionPassword;accPassword~);accUnit;orderTo~) + -- V[ONE*Order]; (I /\ V[Order*SESSION];"_SESSION";(sessionUserid;accUserid~ /\ sessionPassword;accPassword~);accUnit;orderTo~) V[ONE*Order];(I /\ -(irCollectionOrder~;irCollectionOrder)) BOX[ "Order" : I , "Status" : orderStatus @@ -116,7 +116,7 @@ BOX[ "Orders" : INTERFACE "Workload (SupportedUnit)" FOR SupportedUnit : I[ONE] BOX[ "Orders to be carried out" : - -- V[ONE*Order]; (I /\ V[Order*SESSION];'_SESSION';(sessionUserid;accUserid~ /\ sessionPassword;accPassword~);accUnit;orderTo~) + -- V[ONE*Order]; (I /\ V[Order*SESSION];"_SESSION";(sessionUserid;accUserid~ /\ sessionPassword;accPassword~);accUnit;orderTo~) V[ONE*Order];(I /\ -(irCollectionOrder~;irCollectionOrder)) ] @@ -186,7 +186,7 @@ BOX[ "ICOs to be executed" : ] ] -INTERFACE "Order (Plans)" FOR Plans : I[Order] --$ /\ (V[Order*SESSION];'_SESSION';(sessionUserid;accUserid~ /\ sessionPassword;accPassword~);accUnit;orderVan~ \/ -(orderVan;orderVan~)) --!Results in "Fatal error 396 (module P2A_Converters, Ampersand v2.2.0.537)" +INTERFACE "Order (Plans)" FOR Plans : I[Order] --$ /\ (V[Order*SESSION];"_SESSION";(sessionUserid;accUserid~ /\ sessionPassword;accPassword~);accUnit;orderVan~ \/ -(orderVan;orderVan~)) --!Results in "Fatal error 396 (module P2A_Converters, Ampersand v2.2.0.537)" BOX[ "orderID" : I INTERFACE "Order Content" , "Intel Requirements" : irOrder~ INTERFACE "Intel Requirement" --?Work to be done diff --git a/MDT/Kentekenplaten/kentekens.adl b/MDT/Kentekenplaten/kentekens.adl index 38332dc6..86dc2053 100644 --- a/MDT/Kentekenplaten/kentekens.adl +++ b/MDT/Kentekenplaten/kentekens.adl @@ -133,12 +133,12 @@ ENDPATTERN INTERFACE Rdw : I[SESSION] cRud TABS [ aanvragen : I;V[SESSION*Aanvraag] cRud - , "Voertuigen" : '_SESSION';V[SESSION*Voertuig] CRuD + , "Voertuigen" : "_SESSION";V[SESSION*Voertuig] CRuD BOX [ "VIN" : vin CRUd , "Kenteken" : opgegeven CRUd , "eigenaar / houder" : eigenaarHouder CRUd ] - , "Fabrikanten" : '_SESSION';V[SESSION*Fabrikant] CRuD + , "Fabrikanten" : "_SESSION";V[SESSION*Fabrikant] CRuD BOX [ -- "Fabrikant" : naam CRUd "Fabrikant" : I CRud LINKTO INTERFACE Fabrikant ] @@ -252,8 +252,8 @@ VIEW Fabrikanten : Fabrikant DEFAULT { "naam" : naam } ENDVIEW -- The following VIEW replaces 'dirty' SESSION identifiers with the text "My Session" or "Some other Session" VIEW Sessions: SESSION DEFAULT -{ "uid": '_SESSION'[SESSION];V;'My Session'[LoginMessage] - \/ (I[SESSION]-'_SESSION');V;'Some other Session'[LoginMessage] +{ "uid": "_SESSION"[SESSION];V;"My Session"[LoginMessage] + \/ (I[SESSION]-"_SESSION");V;"Some other Session"[LoginMessage] } ENDVIEW POPULATION LoginMessage CONTAINS [ "My Session", "Some other Session" ] diff --git a/MDT/RollenEnBeheerdersPassen/Sleutelbossen.adl b/MDT/RollenEnBeheerdersPassen/Sleutelbossen.adl index 23e84efe..0864c3fb 100644 --- a/MDT/RollenEnBeheerdersPassen/Sleutelbossen.adl +++ b/MDT/RollenEnBeheerdersPassen/Sleutelbossen.adl @@ -107,20 +107,20 @@ VIOLATION (TXT "{EX} NewStruct;SleutelWaarde" POPULATION SleutelType CONTAINS ["RDW-IDENT"] -INTERFACE "KlantIdents" : '_SESSION';V[SESSION*KlantIdent] LINKTO INTERFACE "KlantIdent" +INTERFACE "KlantIdents" : "_SESSION";V[SESSION*KlantIdent] LINKTO INTERFACE "KlantIdent" INTERFACE "KlantIdent" : I[KlantIdent] BOX [ "sleutels" : klantIdent~ CRuD BOX [ "type" : mnemonic cRUD , "waarde" : waarde CRUD ] ] -INTERFACE "KlantSleutels" FOR Sleutelbeheerder : '_SESSION';V[SESSION*KlantSleutel] CRuD BOX +INTERFACE "KlantSleutels" FOR Sleutelbeheerder : "_SESSION";V[SESSION*KlantSleutel] CRuD BOX [ "Sleutelbos" : klantIdent , "type" : mnemonic cRUD , "waarde" : waarde ] -INTERFACE "Sleuteltypes" FOR Sleutelbeheerder : '_SESSION';V[SESSION*SleutelType] CRuD BOX +INTERFACE "Sleuteltypes" FOR Sleutelbeheerder : "_SESSION";V[SESSION*SleutelType] CRuD BOX [ "type" : naam CRUD ] INTERFACE "Sleuteltype" : I[SleutelType] CRuD BOX @@ -154,7 +154,7 @@ PATTERN MIIS ENDPATTERN -INTERFACE "GebrIdents" FOR BBS : '_SESSION';V[SESSION*GebrIdent] BOX +INTERFACE "GebrIdents" FOR BBS : "_SESSION";V[SESSION*GebrIdent] BOX [ "GebrIdent" : I INTERFACE "GebrIdent" ] INTERFACE "GebrIdent" FOR BBS : I[GebrIdent] diff --git a/MDT/Wellicht Verouderd/DienstenPassen.adl b/MDT/Wellicht Verouderd/DienstenPassen.adl index 98fbfa80..de0c23d2 100644 --- a/MDT/Wellicht Verouderd/DienstenPassen.adl +++ b/MDT/Wellicht Verouderd/DienstenPassen.adl @@ -6,7 +6,7 @@ PATTERN Organisaties sessionOrg :: SESSION * Organization [UNI] -- Organisatie voor wie ik in de sessie eaan het werk ben sessionNewCert :: SESSION * CertNaam [UNI] REPRESENT CertNaam TYPE ALPHANUMERIC ROLE ExecEngine MAINTAINS "makeNewCert" -RULE makeNewCert : '_SESSION';sessionNewCert |- -V +RULE makeNewCert : "_SESSION";sessionNewCert |- -V VIOLATION (TXT "{EX} NewStruct;Certificaat" ,TXT ";certNaam;Certificaat;_NEW;CertNaam;", TGT I ,TXT ";certOrg;Certificaat;_NEW;Organization;", SRC sessionOrg diff --git a/MDT/Wellicht Verouderd/DienstenPassen.ifc b/MDT/Wellicht Verouderd/DienstenPassen.ifc index 57ad9ea1..e4fc1446 100644 --- a/MDT/Wellicht Verouderd/DienstenPassen.ifc +++ b/MDT/Wellicht Verouderd/DienstenPassen.ifc @@ -20,9 +20,9 @@ VIOLATION (TXT "Voor ", SRC I, TXT " is nog geen certificaat aangevraagd." ) ROLE KlantRegistratie MAINTAINS nieuweOrganisatie --INTERFACE "Aanvragen Passen" -INTERFACE Organisaties : '_SESSION';V[SESSION*Organisatie] +INTERFACE Organisaties : "_SESSION";V[SESSION*Organisatie] COLS [ Organisatie : I ] -INTERFACE Aanvragen : '_SESSION';V[SESSION*Aanvraag] +INTERFACE Aanvragen : "_SESSION";V[SESSION*Aanvraag] COLS [ Aanvraag : I ] INTERFACE Organisatie : I[Organisatie] TABS [ Aanvragen : voor~ @@ -35,7 +35,7 @@ INTERFACE Organisatie : I[Organisatie] , Certificaten : houderVan~ ] sessionNewOrg :: SESSION*OrganisatieNaam -INTERFACE OrganisatieOverview (sessionNewOrg, naam, adres) FOR KlantRegistratie : '_SESSION'[SESSION] +INTERFACE OrganisatieOverview (sessionNewOrg, naam, adres) FOR KlantRegistratie : "_SESSION"[SESSION] BOX[ "Nieuwe organisatie" : sessionNewOrg , "Organisaties" : V[SESSION*Organisatie] BOX [ naam : naam diff --git a/MDT/include/localSettings.php b/MDT/include/localSettings.php index 57fff76d..58edd051 100644 --- a/MDT/include/localSettings.php +++ b/MDT/include/localSettings.php @@ -36,7 +36,7 @@ ** POPULATION Role CONTAINS [ "", "", ... ]** 7) The text 'BOX [ "ignored" : I ]' is not used, so it can be replaced with anything that the parser accepts. 8) REPRESENT Role TYPE is not allowed: A 'Role' may not be a scalar (it must be an Object-type) --} INTERFACE "SessionUser" FOR NobodyInParticular : '_SESSION';V[SESSION*User] BOX [ "ignored" : I] +-} INTERFACE "SessionUser" FOR NobodyInParticular : "_SESSION";V[SESSION*User] BOX [ "ignored" : I] {- Notes: 1) The name of the interface must be 'SessionUser' 2) The 'FOR NobodyInParticular' ensures that the INTERFACE does not show up in a menu. diff --git a/MPTrx/MPTrx_DataTransfers.adl b/MPTrx/MPTrx_DataTransfers.adl index 6eb15216..0f0f9572 100644 --- a/MPTrx/MPTrx_DataTransfers.adl +++ b/MPTrx/MPTrx_DataTransfers.adl @@ -74,7 +74,7 @@ INTERFACE "[DataTransfer]" FOR Developer: I[DataTransfer] cRud BOX INTERFACE "ShowDataTransfers": I[Scope] cRud BOX [ "Transmit": dtrfScope~ - /\ V[Scope*SESSION];'_SESSION';sessionAccount + /\ V[Scope*SESSION];"_SESSION";sessionAccount ;(tPartyAcc~;dtrfSrc~ /\ -I;tPartyAcc~;dtrfTgt~) cRud BOX -- [ "To" : dtrfTgt;tPartyAcc cRud @@ -82,7 +82,7 @@ INTERFACE "ShowDataTransfers": I[Scope] cRud BOX ] , "Receive": dtrfScope~ - /\ V[Scope*SESSION];'_SESSION';sessionAccount + /\ V[Scope*SESSION];"_SESSION";sessionAccount ;(tPartyAcc~;dtrfTgt~ /\ -I;tPartyAcc~;dtrfSrc~) cRud BOX -- [ "From" : dtrfSrc;tPartyAcc cRud @@ -91,7 +91,7 @@ INTERFACE "ShowDataTransfers": I[Scope] cRud BOX ] , "Local": dtrfScope~ - /\ V[Scope*SESSION];'_SESSION';sessionAccount + /\ V[Scope*SESSION];"_SESSION";sessionAccount ;tPartyAcc~;(dtrfSrc /\ dtrfTgt)~ cRud BOX -- [ "Contents" : dtrfVar cRud diff --git a/MPTrx/MPTrx_Demo.ifc b/MPTrx/MPTrx_Demo.ifc index 8d998733..6f194e7c 100644 --- a/MPTrx/MPTrx_Demo.ifc +++ b/MPTrx/MPTrx_Demo.ifc @@ -1,9 +1,9 @@ CONTEXT "MPTrxUserInterfaces" IN ENGLISH --[Overviews]-- -INTERFACE "{Transactions}" FOR User: '_SESSION'[SESSION];sessionAccount cRud TABS +INTERFACE "{Transactions}" FOR User: "_SESSION"[SESSION];sessionAccount cRud TABS [ "My cases": I[Account] cRud BOX - [ "Create new case": I[Account] /\ sessionAccount~;'_SESSION';sessionAccount cRud BOX + [ "Create new case": I[Account] /\ sessionAccount~;"_SESSION";sessionAccount cRud BOX [ "Required arguments": I[Account] cRud COLS [ "CasusID": accNewCasusID cRUd , "Template": accMPTrxTemplate cRUd @@ -39,7 +39,7 @@ INTERFACE "{ShowMPTrxSummary}" FOR User: I[Scope] cRud BOX [ "MPTrx" : I[Scope] cRud LINKTO INTERFACE "{MPTrxCasus}" , "Description" : scopeDescr cRud , "Status" : I[Scope] cRud --- , "My Auth.Level" : V[Scope*SESSION];'_SESSION' cRud BOX +-- , "My Auth.Level" : V[Scope*SESSION];"_SESSION" cRud BOX -- [ "ALvl": sessionAuthISOLevel cRud ] ] -- , "Next, we instruct the user (when needed) to select a Party": I[Scope] INTERFACE "{OptionalParticipationWarning}" @@ -47,7 +47,7 @@ INTERFACE "{ShowMPTrxSummary}" FOR User: I[Scope] cRud BOX INTERFACE "{OptionalParticipationWarning}" FOR User: I[Scope] cRud BOX [ "This is to warn the user that he should select a Party": - (V[Scope*SESSION]-(ttScope~;tPartyAcc;sessionAccount~;'_SESSION')) + (V[Scope*SESSION]-(ttScope~;tPartyAcc;sessionAccount~;"_SESSION")) ;V;'If you want to participate, please claim a Party for yourself'[IfcText] ] POPULATION IfcText CONTAINS [ "If you want to participate, please claim a Party for yourself" ] @@ -68,7 +68,7 @@ INTERFACE "{MPTrxCasus}" FOR User: mptrxIsaCasus cRud TABS , "My to-do list" : I[Scope] cRud BOX [ "If we are not done": I-mptrxIsPromisable cRud BOX [ "Only show unevaluatable Variables if they exist": - I /\ V;'_SESSION' + I /\ V;"_SESSION" ;( sessionAuthISOLevel;-isoLevelGTE;ttReqdLoA~ /\ sessionAccount;ttValSupAcc~ ) @@ -79,7 +79,7 @@ INTERFACE "{MPTrxCasus}" FOR User: mptrxIsaCasus cRud TABS I /\ ttScope~ -- All TTexts in the MPTrx ;( (ttIsaVariable-ttValue;ttValue~) -- with the property that they are a Variable without an assigned value - /\ V[TText*SESSION];'_SESSION' -- and the user is authenticated with a LoA that is + /\ V[TText*SESSION];"_SESSION" -- and the user is authenticated with a LoA that is ;( sessionAuthISOLevel;isoLevelGTE;ttReqdLoA~ -- sufficiently large to allow editing /\ sessionAccount;ttValSupAcc~ -- and the user occupies the SHRole that must provide the value ) ) @@ -88,7 +88,7 @@ INTERFACE "{MPTrxCasus}" FOR User: mptrxIsaCasus cRud TABS [ "My to-do Variables": ttScope~ -- All TTexts in the MPTrx ;( (ttIsaVariable-ttValue;ttValue~) -- with the property that they are a Variable without an assigned value - /\ V[TText*SESSION];'_SESSION' -- and the user is authenticated with a LoA that is + /\ V[TText*SESSION];"_SESSION" -- and the user is authenticated with a LoA that is ;( sessionAuthISOLevel;isoLevelGTE;ttReqdLoA~ -- sufficiently large to allow editing /\ sessionAccount;ttValSupAcc~ -- and the user occupies the SHRole that must provide the value ) ) @@ -97,7 +97,7 @@ INTERFACE "{MPTrxCasus}" FOR User: mptrxIsaCasus cRud TABS , "Only show to-do Objectives if they exist": I /\ ttScope~ -- All TTexts in the MPTrx ;(objvIsEnabled-objvIsAddressed) -- with the property that they are enabled, unaddressed Objectives - ;ttValSupAcc;sessionAccount~;'_SESSION' -- and the user occupies the SHRole that must provide the value + ;ttValSupAcc;sessionAccount~;"_SESSION" -- and the user occupies the SHRole that must provide the value ;V cRud BOX [ "Objectives": @@ -112,7 +112,7 @@ INTERFACE "{MPTrxCasus}" FOR User: mptrxIsaCasus cRud TABS , "Revise/Supply Data" : I[Scope] cRud BOX -- These are only TTexts that the user must supply values for [ "If we are not done": I-mptrxIsPromisable cRud BOX [ "Only show evaluatable Variables if they exist": - I /\ V;'_SESSION' + I /\ V;"_SESSION" ;( sessionAuthISOLevel;isoLevelGTE;ttReqdLoA~ /\ sessionAccount;ttValSupAcc~ ) @@ -120,12 +120,12 @@ INTERFACE "{MPTrxCasus}" FOR User: mptrxIsaCasus cRud TABS [ "Variables to be valuated": I cRud INTERFACE "{EvaluatableVariables}" ] , "Only show unevaluatable Variables if they exist": - I /\ V;'_SESSION' + I /\ V;"_SESSION" ;( sessionAuthISOLevel;-isoLevelGTE;ttReqdLoA~ /\ sessionAccount;ttValSupAcc~ ) ;ttScope cRud BOX - [ "Current authentication level": V[Scope*SESSION];'_SESSION' cRud ROWS [ "You are authenticated at level" : sessionAuthISOLevel cRud ] + [ "Current authentication level": V[Scope*SESSION];"_SESSION" cRud ROWS [ "You are authenticated at level" : sessionAuthISOLevel cRud ] , "Unevaluatable Variables": I cRud INTERFACE "{UnEvaluatableVariables}" ] ] @@ -134,7 +134,7 @@ INTERFACE "{MPTrxCasus}" FOR User: mptrxIsaCasus cRud TABS ] , "(Re)evaluate Objectives" : I[Scope] cRud BOX -- These are objectives the user must evaluate [ "If we are not done": I-mptrxIsPromisable cRud BOX - [ "Only show Objectives if they exist": I /\ ttScope~;(objvIsEnabled /\ ttValSupAcc;sessionAccount~;'_SESSION';V);ttScope cRud BOX + [ "Only show Objectives if they exist": I /\ ttScope~;(objvIsEnabled /\ ttValSupAcc;sessionAccount~;"_SESSION";V);ttScope cRud BOX [ "Objectives" : ttScope~;objvIsEnabled cRuD INTERFACE "{EvaluateObjective}" ] ] @@ -145,7 +145,7 @@ INTERFACE "{MPTrxCasus}" FOR User: mptrxIsaCasus cRud TABS , "Data transfers & Privacy" : I[Scope] cRud BOX [ "Only show DataTransfers if they exist for the user": I /\ dtrfScope~;(dtrfSrc\/dtrfTgt) - ;tPartyAcc;sessionAccount~;'_SESSION';V + ;tPartyAcc;sessionAccount~;"_SESSION";V cRud BOX [ "Data transfers" : I[Scope] cRud INTERFACE "ShowDataTransfers" ] @@ -153,7 +153,7 @@ INTERFACE "{MPTrxCasus}" FOR User: mptrxIsaCasus cRud TABS , "If we are done": mptrxIsPromisable cRud INTERFACE "{TransactionIsPromisedNotification}" ] , "Revise Objective Semantics" : I[Scope] cRud BOX -- These are objectives owned by the user in his capacity as a TParty - [ "My Seat(s)" : ttScope~;(ttIsaTParty /\ tPartyAcc;sessionAccount~;'_SESSION';V) + [ "My Seat(s)" : ttScope~;(ttIsaTParty /\ tPartyAcc;sessionAccount~;"_SESSION";V) cRud BOX [ "TParty header": I cRud BOX [ "TParty text": V;'SHRole:'[IfcText] cRud @@ -163,15 +163,15 @@ INTERFACE "{MPTrxCasus}" FOR User: mptrxIsaCasus cRud TABS ] ] , "My Objectives" : - ttScope~;(ttIsaTParty /\ tPartyAcc;sessionAccount~;'_SESSION';V) -- this is the list of TParties/SHRoles/seats that the user occupies + ttScope~;(ttIsaTParty /\ tPartyAcc;sessionAccount~;"_SESSION";V) -- this is the list of TParties/SHRoles/seats that the user occupies ;ttValSupplier~;ttIsaObjective cRud INTERFACE "{EditMyObjectives}" -- The INTERFACE selects the objectives owned by the user , "My Variables": - ttScope~;(ttIsaTParty /\ tPartyAcc;sessionAccount~;'_SESSION';V) -- RULE "Re-assign variable ownership" ensures appropriate ownership of variables - ;tPartyAcc;(I /\ V;'_SESSION';sessionAccount);ttOwner~;ttIsaVariable + ttScope~;(ttIsaTParty /\ tPartyAcc;sessionAccount~;"_SESSION";V) -- RULE "Re-assign variable ownership" ensures appropriate ownership of variables + ;tPartyAcc;(I /\ V;"_SESSION";sessionAccount);ttOwner~;ttIsaVariable cRud INTERFACE "{EditTemplateVariables}" -- The INTERFACE selects the variables owned by the user , "My ValSuppliers" : - ttScope~;(ttIsaTParty /\ ttOwner;sessionAccount~;'_SESSION';V) -- this is the list of TParties/SHRoles/seats that the user occupies + ttScope~;(ttIsaTParty /\ ttOwner;sessionAccount~;"_SESSION";V) -- this is the list of TParties/SHRoles/seats that the user occupies cRud BOX [ "Name" : ttName cRUd , "Description" : ttDescr cRUd @@ -193,20 +193,20 @@ INTERFACE "{TPartyManagement}" FOR User: ttScope~;ttIsaTParty cRud BOX [ "Claim Role": -- user can claim a SHRole if... I-(tPartyAcc;tPartyAcc~) -- the SHRole is not occupied /\ ( (ttIsaTParty-(tPartyReqdOrg;tPartyReqdOrg~)) -- and either no specific organization is required for this TParty - \/ V;'_SESSION';sessionOrg;tPartyReqdOrg~ -- or the user is in (one of) the required organization(s). + \/ V;"_SESSION";sessionOrg;tPartyReqdOrg~ -- or the user is in (one of) the required organization(s). ) cRud BOX [ "property": tPartyClaimSeatReq cRUd ] , "Leave Role": -- user can leave a SHRole if... - I /\ tPartyAcc;sessionAccount~;'_SESSION';V -- (s)he occupies that SHRole + I /\ tPartyAcc;sessionAccount~;"_SESSION";V -- (s)he occupies that SHRole cRud BOX [ "property": tPartyLeaveSeatReq cRUd, "popovertext": ttName cRud ] , "Kick Party": -- user can kick another party/user off a SHRole if... - I /\ tPartyAcc;-I;sessionAccount~;'_SESSION';V -- it is another part that occupies the SHRole - /\ ttScope;scopeOwner;sessionAccount~;'_SESSION';V -- and the user himself owns the Casus + I /\ tPartyAcc;-I;sessionAccount~;"_SESSION";V -- it is another part that occupies the SHRole + /\ ttScope;scopeOwner;sessionAccount~;"_SESSION";V -- and the user himself owns the Casus cRud BOX [ "property" : tPartyLeaveSeatReq cRUd, "popovertext": ttName cRud ] , "Reserved": -- user cannot claim the (unoccupied) SHRole, because he does not belong to a required organization I-(tPartyAcc;tPartyAcc~) -- the SHRole is not occupied /\ tPartyReqdOrg;tPartyReqdOrg~ -- and the SHRole requires someone from a specific organization - /\ V;'_SESSION';-(sessionOrg;tPartyReqdOrg~) -- and the user is not of such an organization. + /\ V;"_SESSION";-(sessionOrg;tPartyReqdOrg~) -- and the user is not of such an organization. cRud BOX [ "property": tPartyLeaveSeatReq cRUd, "popovertext": V;'You are not in one of the required organizations'[PopOverText] cRud ] ] , "Name": ttName cRud @@ -216,7 +216,7 @@ POPULATION PopOverText CONTAINS [ "You are not in one of the required organizati --[Objectives]-- INTERFACE "{EditMyObjectives}" FOR User: -- A (runtime) Objective is mine iff I play the objvSHRrole - ttIsaObjective /\ ttIsaCasus /\ ttValSupAcc;sessionAccount~;'_SESSION';V + ttIsaObjective /\ ttIsaCasus /\ ttValSupAcc;sessionAccount~;"_SESSION";V cRuD BOX -- Adding objectives must be done with a request, because all sorts of other stuff needs to be initialized at the same time. [ " ": (ttIsaObjective-ttICO;ttICO~) -- You can delete an objective if it is not a copy, \/ (ttIsaObjective /\ ttICO;ttDescr;-I;ttDescr~) -- or if it is a copy and its meaning (description or template) has been altered. @@ -224,7 +224,7 @@ INTERFACE "{EditMyObjectives}" FOR User: -- A (runtime) Objective is mine iff I cRud BOX [ "Delete": I cRud BOX [ "property": ttDelObjectiveReq cRUd - , "disabled": ttIsaObjective-(V;'_SESSION';sessionAccount;ttOwner~) cRud + , "disabled": ttIsaObjective-(V;"_SESSION";sessionAccount;ttOwner~) cRud ] ] , " ": ttIsaObjective -- You can enable/disable an objective if it is a copy with unchanged meaning, i.e.: @@ -233,11 +233,11 @@ INTERFACE "{EditMyObjectives}" FOR User: -- A (runtime) Objective is mine iff I cRud BOX [ "Disable": I-objvIsDisabled cRud BOX [ "property": objvIsDisabled cRUd - , "disabled": ttIsaObjective-(V;'_SESSION';sessionAccount;ttOwner~) cRud + , "disabled": ttIsaObjective-(V;"_SESSION";sessionAccount;ttOwner~) cRud ] , "Enable": objvIsDisabled cRud BOX [ "property": objvIsDisabled cRUd - , "disabled": ttIsaObjective-(V;'_SESSION';sessionAccount;ttOwner~) cRud + , "disabled": ttIsaObjective-(V;"_SESSION";sessionAccount;ttOwner~) cRud ] ] , "Objective" : ttName cRUd -- rough description of the objective @@ -250,7 +250,7 @@ POPULATION IfcText CONTAINS [ "SHRole:", "LOA:"] INTERFACE "{EvaluateObjective}" FOR User: ttIsaCasus /\ objvIsEnabled - /\ ttValSupAcc;sessionAccount~;'_SESSION';V cRud + /\ ttValSupAcc;sessionAccount~;"_SESSION";V cRud BOX [ " " : I cRud BOX [ "Mark as Addressed": I-objvIsAddressed cRud BOX [ "property": objvIsAddressed cRUd, "popovertext": V;'Clicking the button indicates that you have decided that this objective is addressed'[PopOverText] cRud ] @@ -265,7 +265,7 @@ POPULATION PopOverText CONTAINS [ "If you decide that this objective is NOT sati --[Variables]-- INTERFACE "{EditTemplateVariables}" FOR User: -- Allows you to specify variables for generic stakeholders. - ttIsaVariable /\ ttOwner;sessionAccount~;'_SESSION';V cRud BOX + ttIsaVariable /\ ttOwner;sessionAccount~;"_SESSION";V cRud BOX [ "Variable" : ttName cRud -- name of the variables , "ValSupplier": ttValSupName cRUd -- SHRole that decides whether or not the objective is addressed , "Specification" : ttTemplate cRUd -- criteria by which SHRole decides whether or not the objective is addressed @@ -284,7 +284,7 @@ INTERFACE "{EvaluatableVariables}" FOR User: I[Scope] cRud BOX , "Variables to be filled in": ttScope~ -- All TTexts in the MPTrx ;( (ttIsaVariable) -- with the property that they are a Variable - /\ V[TText*SESSION];'_SESSION' -- and the user is authenticated with a LoA that is + /\ V[TText*SESSION];"_SESSION" -- and the user is authenticated with a LoA that is ;( sessionAuthISOLevel;isoLevelGTE;ttReqdLoA~ -- sufficiently large to allow editing /\ sessionAccount;ttValSupAcc~ -- and the user occupies the SHRole that must provide the value ) ) @@ -293,7 +293,7 @@ INTERFACE "{EvaluatableVariables}" FOR User: I[Scope] cRud BOX POPULATION IfcText CONTAINS [ "Variables to be filled in" ] INTERFACE "{UnEvaluatableVariables}" FOR User: -- Unevaluatable because TParty LoA is too low - ttScope~;V;'_SESSION' + ttScope~;V;"_SESSION" ;( sessionAuthISOLevel;-isoLevelGTE;ttReqdLoA~ /\ sessionAccount;ttValSupAcc~ );ttIsaVariable cRud BOX diff --git a/MPTrx/MPTrx_Developer.ifc b/MPTrx/MPTrx_Developer.ifc index 7befefb3..ae0e50ea 100644 --- a/MPTrx/MPTrx_Developer.ifc +++ b/MPTrx/MPTrx_Developer.ifc @@ -21,7 +21,7 @@ VIEW Scopes: Scope(scopeID) CLASSIFY ScopeID ISA IfcText -- This allows ScopeIDs to viewed by the template -INTERFACE "[DEV Overview]" FOR Developer: '_SESSION' cRud TABS +INTERFACE "[DEV Overview]" FOR Developer: "_SESSION" cRud TABS [ "MPTrxs" : V[SESSION*Scope] cRud INTERFACE "[MPTrxSummary]" , "Objectives" : V[SESSION*Scope] cRud BOX [ "MPTrx" : scopeID , "Objectvs": I cRud INTERFACE "[ObjectiveList]" ,"separator": I-I cRud ] , "Variables" : V[SESSION*Scope] cRud BOX [ "MPTrx" : scopeID , "Variabls": I cRud INTERFACE "[VariableList]" ,"separator": I-I cRud ] diff --git a/MPTrx/MPTrx_DynamicSemantics.adl b/MPTrx/MPTrx_DynamicSemantics.adl index f09074e6..854dceea 100644 --- a/MPTrx/MPTrx_DynamicSemantics.adl +++ b/MPTrx/MPTrx_DynamicSemantics.adl @@ -65,7 +65,7 @@ RULE "Delete TParties in a casus that have no proper owner": -- Objectives that (ttIsaCasus /\ ttIsaTParty);ttOwner -- if a TParty (in a casus) has an owner, |- ttScope;ttScope~;ttIsaTParty;tPartyAcc -- this Owner must be an Account that is a stakeholder in the casus \/ ttICO;ttOwner -- or this Owner must be the owner of the TParty of which it is a copy --- \/ V;'_SESSION';sessionAccount -- some leniency within sessions may be necessary (but I haven't seen a use-case yet) +-- \/ V;"_SESSION";sessionAccount -- some leniency within sessions may be necessary (but I haven't seen a use-case yet) MEANING "The owner of a TParty in a casus must be an Account that is a stakeholder in the casus, or the owner of the TParty of which it is a copy" VIOLATION (TXT "{EX} DelPair;ttOwner;TText;", SRC I[TText], TXT ";Account;", TGT I) @@ -96,7 +96,7 @@ RULE "Delete Variables in a casus that have no proper owner": -- Objectives that (ttIsaCasus /\ ttIsaVariable);ttOwner -- if a Variable (in a casus) has an owner, |- ttScope;ttScope~;ttIsaTParty;tPartyAcc -- this Owner must be an Account that is a stakeholder in the casus \/ ttICO;ttOwner -- or this Owner must be the owner of the Variable of which it is a copy --- \/ V;'_SESSION';sessionAccount -- some leniency within sessions may be necessary (but I haven't seen a use-case yet) +-- \/ V;"_SESSION";sessionAccount -- some leniency within sessions may be necessary (but I haven't seen a use-case yet) MEANING "The owner of a Variable in a casus must be an Account that is a stakeholder in the casus, or the owner of the Variable of which it is a copy" VIOLATION (TXT "{EX} DelPair;ttOwner;TText;", SRC I[TText], TXT ";Account;", TGT I) diff --git a/MPTrx/MPTrx_User.ifc b/MPTrx/MPTrx_User.ifc index 4582ee59..0228fe20 100644 --- a/MPTrx/MPTrx_User.ifc +++ b/MPTrx/MPTrx_User.ifc @@ -72,7 +72,7 @@ RULE "Reset `accCreateCasusReq`": accCreateCasusReq |- accMPTrxTemplate;V;accNewCasusID~ VIOLATION (TXT "{EX} DelPair;accCreateCasusReq;Account;", SRC I, TXT ";Account;", TGT I) -INTERFACE "CreateNewCaseForAccount" FOR User: I[Account] /\ sessionAccount~;'_SESSION';sessionAccount cRud BOX +INTERFACE "CreateNewCaseForAccount" FOR User: I[Account] /\ sessionAccount~;"_SESSION";sessionAccount cRud BOX [ "Required arguments": I[Account] cRud COLS [ "CasusID": accNewCasusID cRUd , "Template": accMPTrxTemplate cRUd @@ -118,7 +118,7 @@ RULE "objvIsDisabled is only valid for Objectives": objvIsDisabled |- ttIsaObjec tPartyClaimSeatReq :: TText * TText [PROP] -- Party starts to participate as a TParty. ROLE ExecEngine MAINTAINS "Claim a free TParty SHRole" RULE "Claim a free TParty SHRole": - (ttIsaTParty-(tPartyAcc;tPartyAcc~));tPartyClaimSeatReq;V;'_SESSION';sessionAccount |- tPartyAcc + (ttIsaTParty-(tPartyAcc;tPartyAcc~));tPartyClaimSeatReq;V;"_SESSION";sessionAccount |- tPartyAcc VIOLATION (TXT "{EX} InsPair;tPartyAcc;TText;", SRC I, TXT ";Account;", TGT I) ROLE ExecEngine MAINTAINS "Reset tPartyClaimSeatReq" RULE "Reset tPartyClaimSeatReq": tPartyClaimSeatReq |- ttIsaTParty-(tPartyAcc;tPartyAcc~) @@ -129,7 +129,7 @@ tPartyLeaveSeatReq :: TText * TText [PROP] -- TParty leaves the game, either on ROLE ExecEngine MAINTAINS "Leave or Kick a TParty SHRole" RULE "Leave or Kick a TParty SHRole": tPartyLeaveSeatReq;(tPartyAcc \/ ttScope;scopeOwner) - /\ V;'_SESSION';sessionAccount + /\ V;"_SESSION";sessionAccount |- (ttIsaTParty-(tPartyAcc;tPartyAcc~));V VIOLATION (TXT "{EX} DelPair;tPartyAcc;TText;", SRC I, TXT ";Account;", TGT I) @@ -138,12 +138,12 @@ RULE "Reset tPartyLeaveSeatReq": tPartyLeaveSeatReq -- a tPartyLeaveSeatReq is valid if: |- (ttIsaTParty /\ tPartyAcc;tPartyAcc~) -- the TParty is occupied ;(tPartyAcc \/ ttScope;scopeOwner) -- and either the TParty or the scope Owner - ;sessionAccount~;'_SESSION';V -- have issued the request + ;sessionAccount~;"_SESSION";V -- have issued the request MEANING "No longer valid, or invalid tPartyLeaveSeatReqests are discarded" VIOLATION (TXT "{EX} DelPair;tPartyLeaveSeatReq;TText;", SRC I, TXT ";TText;", SRC I) --[Overviews]-- -INTERFACE "Transactions" FOR User: '_SESSION'[SESSION];sessionAccount cRud TABS +INTERFACE "Transactions" FOR User: "_SESSION"[SESSION];sessionAccount cRud TABS [ "My cases": I[Account] cRud BOX [ "Create new case": I[Account] cRud INTERFACE "CreateNewCaseForAccount" , "Empty line" : I-I cRud @@ -162,7 +162,7 @@ INTERFACE "Transactions" FOR User: '_SESSION'[SESSION];sessionAccount cRud TABS ) cRud INTERFACE "ShowMPTrxSummary" ] POPULATION IfcText CONTAINS [ "Cases in which I participate:"] ---INTERFACE "My Profile" FOR User: '_SESSION'[SESSION];sessionAccount cRud TABS +--INTERFACE "My Profile" FOR User: "_SESSION"[SESSION];sessionAccount cRud TABS -- [ "MPTrx templates": -- scopeOwner~;(I-mptrxIsaCasus) CRuD -- Create and/or maintain my templates -- INTERFACE "CreateOrEditMyMPTrxTemplate" @@ -171,7 +171,7 @@ POPULATION IfcText CONTAINS [ "Cases in which I participate:"] --[MPTrxs/Scopes]-- INTERFACE "New MPTrx" FOR User: I[Scope] CRud INTERFACE "CreateOrEditMyMPTrxTemplate" INTERFACE "CreateOrEditMyMPTrxTemplate" FOR User: -- Define/edit a MPTrx / template that I own - (I[Scope]-mptrxIsaCasus) /\ scopeOwner;sessionAccount~;'_SESSION';V cRuD COLS + (I[Scope]-mptrxIsaCasus) /\ scopeOwner;sessionAccount~;"_SESSION";V cRuD COLS [ "MPTrx template": I cRud LINKTO INTERFACE "MPTrx(TemplateOwnedByUser)" , "Name/ID": scopeID cRUd -- needed in case a new template is being created , "Description" : scopeDescr cRUd @@ -179,7 +179,7 @@ INTERFACE "CreateOrEditMyMPTrxTemplate" FOR User: -- Define/edit a MPTrx / templ --[MPTrx templates]-- INTERFACE "MPTrx(TemplateOwnedByUser)" FOR User: - (I[Scope]-mptrxIsaCasus) /\ scopeOwner;sessionAccount~;'_SESSION';V cRuD TABS + (I[Scope]-mptrxIsaCasus) /\ scopeOwner;sessionAccount~;"_SESSION";V cRuD TABS [ "MPTrx Definition": I[Scope] cRud BOX [ "MPTrxs": I[Scope] cRud COLS [ "Template ID" : scopeID cRud @@ -242,7 +242,7 @@ INTERFACE "MPTrxCasus" FOR User: mptrxIsaCasus cRud TABS , "My to-do list" : I[Scope] cRud BOX [ "Transaction": I cRud INTERFACE "ShowMPTrxSummary" , "Only show unevaluatable Variables if they exist": - I /\ V;'_SESSION' + I /\ V;"_SESSION" ;( sessionAuthISOLevel;-isoLevelGTE;ttReqdLoA~ /\ sessionAccount;ttValSupAcc~ ) @@ -253,7 +253,7 @@ INTERFACE "MPTrxCasus" FOR User: mptrxIsaCasus cRud TABS I /\ ttScope~ -- All TTexts in the MPTrx ;( (ttIsaVariable-ttValue;ttValue~) -- with the property that they are a Variable without an assigned value - /\ V[TText*SESSION];'_SESSION' -- and the user is authenticated with a LoA that is + /\ V[TText*SESSION];"_SESSION" -- and the user is authenticated with a LoA that is ;( sessionAuthISOLevel;isoLevelGTE;ttReqdLoA~ -- sufficiently large to allow editing /\ sessionAccount;ttValSupAcc~ -- and the user occupies the SHRole that must provide the value ) ) @@ -262,7 +262,7 @@ INTERFACE "MPTrxCasus" FOR User: mptrxIsaCasus cRud TABS [ "My to-do Variables": ttScope~ -- All TTexts in the MPTrx ;( (ttIsaVariable-ttValue;ttValue~) -- with the property that they are a Variable without an assigned value - /\ V[TText*SESSION];'_SESSION' -- and the user is authenticated with a LoA that is + /\ V[TText*SESSION];"_SESSION" -- and the user is authenticated with a LoA that is ;( sessionAuthISOLevel;isoLevelGTE;ttReqdLoA~ -- sufficiently large to allow editing /\ sessionAccount;ttValSupAcc~ -- and the user occupies the SHRole that must provide the value ) ) @@ -271,7 +271,7 @@ INTERFACE "MPTrxCasus" FOR User: mptrxIsaCasus cRud TABS , "Only show to-do Objectives if they exist": I /\ ttScope~ -- All TTexts in the MPTrx ;(objvIsEnabled-objvIsAddressed) -- with the property that they are enabled, unaddressed Objectives - ;ttValSupAcc;sessionAccount~;'_SESSION' -- and the user occupies the SHRole that must provide the value + ;ttValSupAcc;sessionAccount~;"_SESSION" -- and the user occupies the SHRole that must provide the value ;V cRud BOX [ "Objectives": @@ -283,7 +283,7 @@ INTERFACE "MPTrxCasus" FOR User: mptrxIsaCasus cRud TABS , "Revise/Supply Data" : I[Scope] cRud BOX -- These are only TTexts that the user must supply values for [ "Transaction": I cRud INTERFACE "ShowMPTrxSummary" , "Only show evaluatable Variables if they exist": - I /\ V;'_SESSION' + I /\ V;"_SESSION" ;( sessionAuthISOLevel;isoLevelGTE;ttReqdLoA~ /\ sessionAccount;ttValSupAcc~ ) @@ -291,12 +291,12 @@ INTERFACE "MPTrxCasus" FOR User: mptrxIsaCasus cRud TABS [ "Variables to be valuated": I cRud INTERFACE "EvaluatableVariables" ] , "Only show unevaluatable Variables if they exist": - I /\ V;'_SESSION' + I /\ V;"_SESSION" ;( sessionAuthISOLevel;-isoLevelGTE;ttReqdLoA~ /\ sessionAccount;ttValSupAcc~ ) ;ttScope cRud BOX - [ "Current authentication level": V[Scope*SESSION];'_SESSION' cRud ROWS [ "You are authenticated at level" : sessionAuthISOLevel cRud ] + [ "Current authentication level": V[Scope*SESSION];"_SESSION" cRud ROWS [ "You are authenticated at level" : sessionAuthISOLevel cRud ] , "Unevaluatable Variables": I cRud INTERFACE "UnEvaluatableVariables" ] ] @@ -310,14 +310,14 @@ INTERFACE "MPTrxCasus" FOR User: mptrxIsaCasus cRud TABS [ "Transaction": I cRud INTERFACE "ShowMPTrxSummary" , "Only show DataTransfers if they exist for the user": I /\ dtrfScope~;(dtrfSrc\/dtrfTgt) - ;tPartyAcc;sessionAccount~;'_SESSION';V + ;tPartyAcc;sessionAccount~;"_SESSION";V cRud BOX [ "Data transfers" : I[Scope] cRud INTERFACE "ShowDataTransfers" ] ] , "Revise Objective Semantics" : I[Scope] cRud BOX -- These are objectives owned by the user in his capacity as a TParty [ "Transaction": I[Scope] cRud INTERFACE "ShowMPTrxSummary" - , "My Seat(s)" : ttScope~;(ttIsaTParty /\ tPartyAcc;sessionAccount~;'_SESSION';V) + , "My Seat(s)" : ttScope~;(ttIsaTParty /\ tPartyAcc;sessionAccount~;"_SESSION";V) cRud BOX [ "TParty header": I{-TParty-} cRud BOX [ "TParty text": V;'SHRole:'[IfcText] cRud @@ -326,19 +326,19 @@ INTERFACE "MPTrxCasus" FOR User: mptrxIsaCasus cRud TABS , "New objective name": tPartyNewObjectiveName cRUd -- , "Specify new objective": I cRud BOX [ "property": tPartyNewObjectiveName cRUd ] -- , "Include template text": V;' Include/import template'[IfcText] cRud --- , "Include template": (ttScope~;tPartyOrg /\ V;'_SESSION';sessionOrg);tPartyImportScope +-- , "Include template": (ttScope~;tPartyOrg /\ V;"_SESSION";sessionOrg);tPartyImportScope ] ] , "My Objectives" : - ttScope~;(ttIsaTParty /\ tPartyAcc;sessionAccount~;'_SESSION';V) -- this is the list of TParties/SHRoles/seats that the user occupies + ttScope~;(ttIsaTParty /\ tPartyAcc;sessionAccount~;"_SESSION";V) -- this is the list of TParties/SHRoles/seats that the user occupies ;ttValSupplier~;ttIsaObjective cRud INTERFACE "EditMyObjectives" -- The INTERFACE selects the objectives owned by the user , "My Variables": - ttScope~;(ttIsaTParty /\ tPartyAcc;sessionAccount~;'_SESSION';V) -- RULE "Re-assign variable ownership" ensures appropriate ownership of variables - ;tPartyAcc;(I /\ V;'_SESSION';sessionAccount);ttOwner~;ttIsaVariable + ttScope~;(ttIsaTParty /\ tPartyAcc;sessionAccount~;"_SESSION";V) -- RULE "Re-assign variable ownership" ensures appropriate ownership of variables + ;tPartyAcc;(I /\ V;"_SESSION";sessionAccount);ttOwner~;ttIsaVariable cRud INTERFACE "EditTemplateVariables" -- The INTERFACE selects the variables owned by the user , "My ValSuppliers" : - ttScope~;(ttIsaTParty /\ ttOwner;sessionAccount~;'_SESSION';V) -- this is the list of TParties/SHRoles/seats that the user occupies + ttScope~;(ttIsaTParty /\ ttOwner;sessionAccount~;"_SESSION";V) -- this is the list of TParties/SHRoles/seats that the user occupies cRud INTERFACE "EditMyTParties" ] ] @@ -347,7 +347,7 @@ POPULATION IfcText CONTAINS [ " Include/import template"] --[TParties]-- INTERFACE "EditMyTParties" FOR User: - ttIsaTParty /\ ttIsaCasus /\ ttOwner;sessionAccount~;'_SESSION';V + ttIsaTParty /\ ttIsaCasus /\ ttOwner;sessionAccount~;"_SESSION";V cRud BOX [ "Name" : ttName cRUd , "Description" : ttDescr cRUd @@ -361,20 +361,20 @@ INTERFACE "TPartyManagement" FOR User: ttScope~;ttIsaTParty cRud BOX [ "Claim Role": -- user can claim a SHRole if... I-(tPartyAcc;tPartyAcc~) -- the SHRole is not occupied /\ ( (ttIsaTParty-(tPartyReqdOrg;tPartyReqdOrg~)) -- and either no specific organization is required for this TParty - \/ V;'_SESSION';sessionOrg;tPartyReqdOrg~ -- or the user is in (one of) the required organization(s). + \/ V;"_SESSION";sessionOrg;tPartyReqdOrg~ -- or the user is in (one of) the required organization(s). ) cRud BOX [ "property": tPartyClaimSeatReq cRUd ] , "Leave Role": -- user can leave a SHRole if... - I /\ tPartyAcc;sessionAccount~;'_SESSION';V -- (s)he occupies that SHRole + I /\ tPartyAcc;sessionAccount~;"_SESSION";V -- (s)he occupies that SHRole cRud BOX [ "property": tPartyLeaveSeatReq cRUd, "popovertext": ttName cRud ] , "Kick Party": -- user can kick another party/user off a SHRole if... - I /\ tPartyAcc;-I;sessionAccount~;'_SESSION';V -- it is another part that occupies the SHRole - /\ ttScope;scopeOwner;sessionAccount~;'_SESSION';V -- and the user himself owns the Casus + I /\ tPartyAcc;-I;sessionAccount~;"_SESSION";V -- it is another part that occupies the SHRole + /\ ttScope;scopeOwner;sessionAccount~;"_SESSION";V -- and the user himself owns the Casus cRud BOX [ "property" : tPartyLeaveSeatReq cRUd, "popovertext": ttName cRud ] , "Reserved": -- user cannot claim the (unoccupied) SHRole, because he does not belong to a required organization I-(tPartyAcc;tPartyAcc~) -- the SHRole is not occupied /\ tPartyReqdOrg;tPartyReqdOrg~ -- and the SHRole requires someone from a specific organization - /\ V;'_SESSION';-(sessionOrg;tPartyReqdOrg~) -- and the user is not of such an organization. + /\ V;"_SESSION";-(sessionOrg;tPartyReqdOrg~) -- and the user is not of such an organization. cRud BOX [ "property": tPartyLeaveSeatReq cRUd, "popovertext": V;'You are not in one of the required organizations'[PopOverText] cRud ] ] , "Occupied by": tPartyAcc cRud @@ -387,7 +387,7 @@ POPULATION PopOverText CONTAINS [ "You are not in one of the required organizati --[Objectives]-- INTERFACE "EditTemplateObjectives" FOR User: -- Allows you to specify objectives for generic stakeholders ttIsaObjective-ttIsaCasus cRud BOX - [ "Owned Template Objectives": ttIsaObjective /\ ttOwner;sessionAccount~;'_SESSION';V + [ "Owned Template Objectives": ttIsaObjective /\ ttOwner;sessionAccount~;"_SESSION";V cRud BOX [ "Objective" : ttName cRUd -- rough description of the objective , "for SHRole": objvSHRoleName cRUd -- SHRole that decides whether or not the objective is addressed @@ -404,7 +404,7 @@ INTERFACE "EditTemplateObjectives" FOR User: -- Allows you to specify objectives -- ] -- , "Owner" : ttOwner cRud -- This is automatically filled in to be the session user ] - , "Unowned Template Objectives": ttIsaObjective - (ttOwner;sessionAccount~;'_SESSION';V) + , "Unowned Template Objectives": ttIsaObjective - (ttOwner;sessionAccount~;"_SESSION";V) cRud BOX [ "Error" : V;'You cannot specify this Objective because you are not its owner.'[ErrMsg] cRud ] @@ -413,7 +413,7 @@ POPULATION IfcText CONTAINS [ "SHRole:", "LOA:"] POPULATION ErrMsg CONTAINS [ "You cannot specify this Objective because you are not its owner." ] INTERFACE "EditMyObjectives" FOR User: -- A (runtime) Objective is mine iff I play the objvSHRrole - ttIsaObjective /\ ttIsaCasus /\ ttValSupAcc;sessionAccount~;'_SESSION';V + ttIsaObjective /\ ttIsaCasus /\ ttValSupAcc;sessionAccount~;"_SESSION";V cRuD BOX -- Adding objectives must be done with a request, because all sorts of other stuff needs to be initialized at the same time. [ " ": (ttIsaObjective-ttICO;ttICO~) -- You can delete an objective if it is not a copy, \/ (ttIsaObjective /\ ttICO;ttDescr;-I;ttDescr~) -- or if it is a copy and its meaning (description or template) has been altered. @@ -421,7 +421,7 @@ INTERFACE "EditMyObjectives" FOR User: -- A (runtime) Objective is mine iff I pl cRud BOX [ "Delete": I cRud BOX [ "property": ttDelObjectiveReq cRUd - , "disabled": ttIsaObjective-(V;'_SESSION';sessionAccount;ttOwner~) cRud + , "disabled": ttIsaObjective-(V;"_SESSION";sessionAccount;ttOwner~) cRud ] ] , " ": ttIsaObjective -- You can enable/disable an objective if it is a copy with unchanged meaning, i.e.: @@ -430,11 +430,11 @@ INTERFACE "EditMyObjectives" FOR User: -- A (runtime) Objective is mine iff I pl cRud BOX [ "Disable": I-objvIsDisabled cRud BOX [ "property": objvIsDisabled cRUd - , "disabled": ttIsaObjective-(V;'_SESSION';sessionAccount;ttOwner~) cRud + , "disabled": ttIsaObjective-(V;"_SESSION";sessionAccount;ttOwner~) cRud ] , "Enable": objvIsDisabled cRud BOX [ "property": objvIsDisabled cRUd - , "disabled": ttIsaObjective-(V;'_SESSION';sessionAccount;ttOwner~) cRud + , "disabled": ttIsaObjective-(V;"_SESSION";sessionAccount;ttOwner~) cRud ] ] , "Objective" : ttName cRUd -- rough description of the objective @@ -457,7 +457,7 @@ POPULATION IfcText CONTAINS [ "SHRole:", "LOA:"] INTERFACE "EvaluateObjective" FOR User: ttIsaCasus /\ objvIsEnabled - /\ ttValSupAcc;sessionAccount~;'_SESSION';V cRud + /\ ttValSupAcc;sessionAccount~;"_SESSION";V cRud BOX [ " " : I cRud BOX [ "Mark as Addressed": I-objvIsAddressed cRud BOX [ "property": objvIsAddressed cRUd, "popovertext": V;'Clicking the button indicates that you have decided that this objective is addressed'[PopOverText] cRud ] @@ -475,7 +475,7 @@ POPULATION PopOverText CONTAINS [ "If you decide that this objective is NOT sati of whatever it is that is owned. Hence, if the session user is the ttOwner of the Variable, it may be edited.-} INTERFACE "EditTemplateVariables" FOR User: -- Allows you to specify variables for generic stakeholders. - ttIsaVariable /\ ttOwner;sessionAccount~;'_SESSION';V cRud BOX + ttIsaVariable /\ ttOwner;sessionAccount~;"_SESSION";V cRud BOX [ "Variable" : ttName cRud -- name of the variables , "ValSupplier": ttValSupName cRUd -- SHRole that decides whether or not the objective is addressed , "Specification" : ttTemplate cRUd -- criteria by which SHRole decides whether or not the objective is addressed @@ -501,7 +501,7 @@ INTERFACE "EvaluatableVariables" FOR User: I[Scope] cRud BOX , "Variables to be filled in": ttScope~ -- All TTexts in the MPTrx ;( (ttIsaVariable) -- with the property that they are a Variable - /\ V[TText*SESSION];'_SESSION' -- and the user is authenticated with a LoA that is + /\ V[TText*SESSION];"_SESSION" -- and the user is authenticated with a LoA that is ;( sessionAuthISOLevel;isoLevelGTE;ttReqdLoA~ -- sufficiently large to allow editing /\ sessionAccount;ttValSupAcc~ -- and the user occupies the SHRole that must provide the value ) ) @@ -512,7 +512,7 @@ INTERFACE "EvaluatableVariables" FOR User: I[Scope] cRud BOX POPULATION IfcText CONTAINS [ "Variables to be filled in" ] INTERFACE "UnEvaluatableVariables" FOR User: -- Unevaluatable because TParty LoA is too low - ttScope~;V;'_SESSION' + ttScope~;V;"_SESSION" ;( sessionAuthISOLevel;-isoLevelGTE;ttReqdLoA~ /\ sessionAccount;ttValSupAcc~ );ttIsaVariable cRud BOX @@ -536,31 +536,31 @@ INTERFACE "ShowMPTrxSummary" FOR User: I[Scope] cRud BOX [ " ": I[Scope]-mptrxIsPromisable cRud BOX -- Only show the button for unpromised cases [ "Delete": I cRud BOX [ "property": scopeDelReq cRUd - , "disabled": I-(V;'_SESSION';sessionAccount;scopeOwner~) cRud + , "disabled": I-(V;"_SESSION";sessionAccount;scopeOwner~) cRud ] ] , "MPTrx" : I[Scope] cRud LINKTO INTERFACE "MPTrxCasus" , "Description" : scopeDescr cRud , "Owner" : scopeOwner cRud , "Status" : I[Scope] cRud - , "My Auth.Level" : V[Scope*SESSION];'_SESSION' cRud BOX + , "My Auth.Level" : V[Scope*SESSION];"_SESSION" cRud BOX [ "ALvl": sessionAuthISOLevel cRud ] ] , "Then, we instruct the user (when needed) to select a Party": - (V[Scope*SESSION]-(ttScope~;tPartyAcc;sessionAccount~;'_SESSION')) + (V[Scope*SESSION]-(ttScope~;tPartyAcc;sessionAccount~;"_SESSION")) ;V;'If you want to participate, please claim a Party for yourself'[IfcText] ] POPULATION IfcText CONTAINS [ "If you want to participate, please claim a Party for yourself" ] INTERFACE "MPTrxStatus" FOR User: I[Scope] cRud BOX [ "Status": -- We have a casus in which the user is a TParty - (mptrxIsaCasus /\ V;'_SESSION';sessionAccount;tPartyAcc~;ttScope) + (mptrxIsaCasus /\ V;"_SESSION";sessionAccount;tPartyAcc~;ttScope) ;( (I-mptrxIsPromisable );V[Scope*MPTrxStatus];'Progressing' -- -p \/ (mptrxIsPromisable -mptrxIsAcceptable);V[Scope*MPTrxStatus];'Promised' -- p /\ -a \/ (mptrxIsPromisable/\mptrxIsAcceptable);V[Scope*MPTrxStatus];'Accepted' -- p /\ a ) \/ -- We have a casus in which the user is not a TParty - (mptrxIsaCasus-(V;'_SESSION';sessionAccount;tPartyAcc~;ttScope)) + (mptrxIsaCasus-(V;"_SESSION";sessionAccount;tPartyAcc~;ttScope)) ;V[Scope*MPTrxStatus];'Hidden from non-participants' \/ -- We have a template (I-mptrxIsaCasus);V;'Template'[MPTrxStatus] cRud diff --git a/MPTrx/MPTrx_Views.adl b/MPTrx/MPTrx_Views.adl index 436690e5..f6aecf38 100644 --- a/MPTrx/MPTrx_Views.adl +++ b/MPTrx/MPTrx_Views.adl @@ -38,11 +38,11 @@ VIEW ShrSeatManagement: TText -- TParty { "ttName" : ttName , "ttDescr" : ttDescr , "tPartyAccUserid" : tPartyAcc;accUserid -, "userIsShr" : I /\ V;'_SESSION';sessionAccount;tPartyAcc~ +, "userIsShr" : I /\ V;"_SESSION";sessionAccount;tPartyAcc~ , "tPartyLeaveSeatReq" : tPartyLeaveSeatReq , "tPartyIsFree" : I - (tPartyAcc;tPartyAcc~) , "tPartyClaimSeatReq" : tPartyClaimSeatReq -, "tPartyIsOccupiedBySomeoneElse" : I /\ V;'_SESSION';sessionAccount;-tPartyAcc~ +, "tPartyIsOccupiedBySomeoneElse" : I /\ V;"_SESSION";sessionAccount;-tPartyAcc~ } HTML TEMPLATE "UETP-ShrSeatManagement.html" ENDVIEW VIEW "PAVS": TText -- Promise, Accept, Valid, Satisfied/Addressed @@ -68,13 +68,13 @@ VIEW ShowISOLevelRed: ISOLevel { "ISOLevel" : I[ISOLevel] } HTML TEMPLATE "ISOL VIEW MPTrxStatus: Scope { "Status": -- We have a casus in which the user is a TParty - (mptrxIsaCasus /\ V[Scope*SESSION];'_SESSION';sessionAccount;tPartyAcc~;ttScope) + (mptrxIsaCasus /\ V[Scope*SESSION];"_SESSION";sessionAccount;tPartyAcc~;ttScope) ;( (I-mptrxIsPromisable );V;'Progressing'[MPTrxStatus] -- -p \/ (mptrxIsPromisable -mptrxIsAcceptable);V;'Promised'[MPTrxStatus] -- p /\ -a \/ (mptrxIsPromisable/\mptrxIsAcceptable);V;'Accepted'[MPTrxStatus] -- p /\ a ) \/ -- We have a casus in which the user is not a TParty - (mptrxIsaCasus-(V[Scope*SESSION];'_SESSION';sessionAccount;tPartyAcc~;ttScope)) + (mptrxIsaCasus-(V[Scope*SESSION];"_SESSION";sessionAccount;tPartyAcc~;ttScope)) ;V[Scope*MPTrxStatus];'Hidden from non-participants' \/ -- We have a template (I-mptrxIsaCasus);V;'Template'[MPTrxStatus] diff --git a/MPTrx/include/templates/views/ShrSeatManagement.html b/MPTrx/include/templates/views/ShrSeatManagement.html index ebdc8e42..b8e7a6d4 100644 --- a/MPTrx/include/templates/views/ShrSeatManagement.html +++ b/MPTrx/include/templates/views/ShrSeatManagement.html @@ -3,11 +3,11 @@ { "shrName" : shrName , "shrDescr" : shrDescr , "shrAccUserid" : shrAcc;accUserid -, "userIsShr" : I /\ V;'_SESSION';sessionAccount;shrAcc~ +, "userIsShr" : I /\ V;"_SESSION";sessionAccount;shrAcc~ , "shrLeaveSeatReq" : shrLeaveSeatReq , "shrIsFree" : I - (shrAcc;shrAcc~) , "shrClaimSeatReq" : shrClaimSeatReq -, "shrIsOccupiedBySomeoneElse" : I /\ V;'_SESSION';sessionAccount;-shrAcc~ +, "shrIsOccupiedBySomeoneElse" : I /\ V;"_SESSION";sessionAccount;-shrAcc~ } HTML TEMPLATE "UETP-ShrSeatManagement.html" ENDVIEW -->
diff --git a/Messaging/Messaging.adl b/Messaging/Messaging.adl index 16212910..22fce7cf 100644 --- a/Messaging/Messaging.adl +++ b/Messaging/Messaging.adl @@ -38,7 +38,7 @@ INTERFACE "Send Message" , msgSender, msgRecipient , msgMsgTitle, msgMsgText , msgURLTitle, msgURLText - ): '_SESSION'[SESSION] cRud + ): "_SESSION"[SESSION] cRud BOX[ "New message to (Person)" : sessionMsgRecipient cRUd , "Message details" : sessionMsg;(I-msgSendReq) CRud COLS [ "Recipient": msgRecipient cRUd @@ -64,7 +64,7 @@ BOX[ "New message to (Person)" : sessionMsgRecipient cRUd --[Message manipulation rules]-- ROLE ExecEngine MAINTAINS "Create new message" -RULE "Create new message": '_SESSION';sessionMsgRecipient |- -V +RULE "Create new message": "_SESSION";sessionMsgRecipient |- -V VIOLATION (TXT "{EX}_;NewStruct_;MsgSendReq" ,TXT "_;sessionMsg_;SESSION_;", SRC I, TXT "_;MsgSendReq_;_NEW" ,TXT "_;msgRecipient_;MsgSendReq_;_NEW_;MsgEndpoint_;", TGT I @@ -95,7 +95,7 @@ INTERFACE "Me" (personFirstName, personLastName ,cepConnectsTo, cepMeans, cepAddress, cepNote ,cepAppUseProp, cvrResponse - ): '_SESSION';sessionPerson cRud BOX + ): "_SESSION";sessionPerson cRud BOX [ "Who I am": I cRud COLS [ "First name": personFirstName cRUd , "Last name" : personLastName cRUd diff --git a/Minho/include/templates/views/ShrSeatManagement.html b/Minho/include/templates/views/ShrSeatManagement.html index ebdc8e42..b8e7a6d4 100644 --- a/Minho/include/templates/views/ShrSeatManagement.html +++ b/Minho/include/templates/views/ShrSeatManagement.html @@ -3,11 +3,11 @@ { "shrName" : shrName , "shrDescr" : shrDescr , "shrAccUserid" : shrAcc;accUserid -, "userIsShr" : I /\ V;'_SESSION';sessionAccount;shrAcc~ +, "userIsShr" : I /\ V;"_SESSION";sessionAccount;shrAcc~ , "shrLeaveSeatReq" : shrLeaveSeatReq , "shrIsFree" : I - (shrAcc;shrAcc~) , "shrClaimSeatReq" : shrClaimSeatReq -, "shrIsOccupiedBySomeoneElse" : I /\ V;'_SESSION';sessionAccount;-shrAcc~ +, "shrIsOccupiedBySomeoneElse" : I /\ V;"_SESSION";sessionAccount;-shrAcc~ } HTML TEMPLATE "UETP-ShrSeatManagement.html" ENDVIEW -->
diff --git a/MirrorMe/Arguments.docadl b/MirrorMe/Arguments.docadl index 5326c436..02030a25 100644 --- a/MirrorMe/Arguments.docadl +++ b/MirrorMe/Arguments.docadl @@ -185,12 +185,12 @@ PURPOSE RELATION claims[Case*Text] IN ENGLISH The user must feel free to choose any phrasing deemed necessary for that case. +} -PURPOSE RULE sessionAuthor IN DUTCH -- (I[Statement]#'_SESSION'[SESSION]);ingelogd |- madeBy;V +PURPOSE RULE sessionAuthor IN DUTCH -- (I[Statement]#"_SESSION"[SESSION]);ingelogd |- madeBy;V {+Om het bestaan van een auteur voor elke bewering (`Statement`) te garanderen, registreert de applicatie de gebruiker van de lopende sessie wordt als degene die de bewering heeft geponeerd. Dit gebeurt met behulp van een geautomatiseerde regel. +} -PURPOSE RULE sessionAuthor IN ENGLISH -- (I[Statement]#'_SESSION'[SESSION]);ingelogd |- madeBy;V +PURPOSE RULE sessionAuthor IN ENGLISH -- (I[Statement]#"_SESSION"[SESSION]);ingelogd |- madeBy;V {+To secure the existence of an author for every statement, the application registers the user of the current session as the person who has made this statement. This is done by means of an automated rule. @@ -222,12 +222,12 @@ Whenever the user phrases a new claim, the application creates a corresponding ` The user only formulates a claim, but needs not worry about creating a new data structure. +} -PURPOSE RULE caseAuthor IN DUTCH -- V[Case*SESSION];'_SESSION';ingelogd |- owner;V +PURPOSE RULE caseAuthor IN DUTCH -- V[Case*SESSION];"_SESSION";ingelogd |- owner;V {+Om het bestaan van een auteur voor elke zaak (`Case`) te garanderen, registreert de applicatie de gebruiker van de lopende sessie als (initiële) zaakeigenaar (`owner`). Dit gebeurt met behulp van een geautomatiseerde regel. +} -PURPOSE RULE caseAuthor IN ENGLISH -- (I[Statement]#'_SESSION'[SESSION]);ingelogd |- madeBy;V +PURPOSE RULE caseAuthor IN ENGLISH -- (I[Statement]#"_SESSION"[SESSION]);ingelogd |- madeBy;V {+To secure the existence of an author for every case, the application registers the user of the current session as the (initial) case owner. This is done by means of an automated rule. diff --git a/MirrorMe/MirrorMe.adl b/MirrorMe/MirrorMe.adl index 3a089e77..db39442a 100644 --- a/MirrorMe/MirrorMe.adl +++ b/MirrorMe/MirrorMe.adl @@ -87,14 +87,14 @@ PATTERN Arguments {-The following code depends on a login mechanism. Revive when it is active - RULE sessionAuthor : (I[TText]#'_SESSION'[SESSION]);ingelogd |- madeBy;V + RULE sessionAuthor : (I[TText]#"_SESSION"[SESSION]);ingelogd |- madeBy;V MEANING "Every statement must must be stated by someone. If not, the application will assign the user of the current session as the person who made the statement." VIOLATION ( TXT "{EX} InsPair;madeBy;TText;", SRC I, TXT ";Actor;" , TGT I , TXT "{EX} InsPair;observed;TText;", SRC I, TXT ";Moment;{php}date(DATE_ISO8601)" -- Current date in ISO 8601 date format ) ROLE ExecEngine MAINTAINS sessionAuthor - RULE caseAuthor : V[Scope*SESSION];'_SESSION';ingelogd |- owner;V + RULE caseAuthor : V[Scope*SESSION];"_SESSION";ingelogd |- owner;V MEANING "Every case must have an owner. If not, the application will assign the user of the current session as the initial owner." VIOLATION ( TXT "{EX} InsPair;owner;Scope;", SRC I, TXT ";Actor;" , TGT I , TXT "{EX} InsPair;created;Scope;", SRC I, TXT ";Moment;{php}date(DATE_ISO8601)" -- Current date in ISO 8601 date format @@ -154,7 +154,7 @@ PURPOSE PATTERN "Case Management" {+This pattern contains some basic administration for cases. +} PATTERN "Case Management" - RULE caseAuthor : V[Case*SESSION];'_SESSION';sessionAccount |- owner;V + RULE caseAuthor : V[Case*SESSION];"_SESSION";sessionAccount |- owner;V -- MEANING "The default/initial owner of a case is the actor that created it." VIOLATION ( TXT "{EX} InsPair;owner;Case;", SRC I, TXT ";Actor;" , TGT I , TXT "{EX} InsPair;created;Case;", SRC I, TXT ";Moment;{php}date(DATE_ISO8601)" -- Current date in ISO 8601 date format diff --git a/MirrorMe/include/templates/views/ShrSeatManagement.html b/MirrorMe/include/templates/views/ShrSeatManagement.html index ebdc8e42..b8e7a6d4 100644 --- a/MirrorMe/include/templates/views/ShrSeatManagement.html +++ b/MirrorMe/include/templates/views/ShrSeatManagement.html @@ -3,11 +3,11 @@ { "shrName" : shrName , "shrDescr" : shrDescr , "shrAccUserid" : shrAcc;accUserid -, "userIsShr" : I /\ V;'_SESSION';sessionAccount;shrAcc~ +, "userIsShr" : I /\ V;"_SESSION";sessionAccount;shrAcc~ , "shrLeaveSeatReq" : shrLeaveSeatReq , "shrIsFree" : I - (shrAcc;shrAcc~) , "shrClaimSeatReq" : shrClaimSeatReq -, "shrIsOccupiedBySomeoneElse" : I /\ V;'_SESSION';sessionAccount;-shrAcc~ +, "shrIsOccupiedBySomeoneElse" : I /\ V;"_SESSION";sessionAccount;-shrAcc~ } HTML TEMPLATE "UETP-ShrSeatManagement.html" ENDVIEW -->
diff --git a/PRACO/AccountsSessionsLogin.include b/PRACO/AccountsSessionsLogin.include index 628f36a3..bed01167 100644 --- a/PRACO/AccountsSessionsLogin.include +++ b/PRACO/AccountsSessionsLogin.include @@ -60,7 +60,7 @@ PURPOSE RULE "Inloggegevens moeten compleet zijn" {+Als een user in eens session inlogt, moet hij doen met zowel een UserID als een Password. Anders kan niet worden ingelogd omdat het bijbehorende Account niet kan worden bepaald en ook niet kan worden geauthenticeerd.+} ROLE Transactor MAINTAINS "Inloggegevens moeten compleet zijn" RULE "Inloggegevens moeten compleet zijn": - '_SESSION'[SESSION] /\ loginUserid;loginUserid~ = '_SESSION'[SESSION] /\ loginPassword;loginPassword~ + "_SESSION"[SESSION] /\ loginUserid;loginUserid~ = "_SESSION"[SESSION] /\ loginPassword;loginPassword~ MEANING "Inloggegevens zijn niet compleet." VIOLATION (TXT "U moet zowel een UserID als een Password opgeven. Probeer het opnieuw.") @@ -90,7 +90,7 @@ MEANING "Het Account dat in een session als eerste is geauthenticeerd, moet gere ROLE ExecEngine MAINTAINS "Het eerst geauthenticeerde session account registreren" RULE "Het eerst geauthenticeerde session account registreren": - ('_SESSION'[SESSION] /\ -(firstSessionAccount;firstSessionAccount~));sessionAccount + ("_SESSION"[SESSION] /\ -(firstSessionAccount;firstSessionAccount~));sessionAccount |- firstSessionAccount MEANING "Voor de eerste keer inloggen mag met elk (geauthenticeerd) account." VIOLATION (TXT "{EX} InsPair;firstSessionAccount;SESSION;", SRC I, TXT ";Account;", TGT I) @@ -99,7 +99,7 @@ PURPOSE RULE "Integriteit van session accounts" {+Er mag hooguit één user inloggen in een session, zodat kan worden gegarandeerd dat het ondubbelzinnig duidelijk is welke persoon verantwoordelijk is voor wat er in een session gebeurt. Dat moet dus ook worden gecontroleerd.+} ROLE Transactor MAINTAINS "Integriteit van session accounts" RULE "Integriteit van session accounts" : - ('_SESSION'[SESSION] /\ firstSessionAccount;firstSessionAccount~);sessionAccount + ("_SESSION"[SESSION] /\ firstSessionAccount;firstSessionAccount~);sessionAccount |- firstSessionAccount MEANING "In een session mag hoogstens één account worden gebruikt." VIOLATION (TXT "U moet met uw eerder ingevoerde credentials inloggen.") @@ -108,7 +108,7 @@ PURPOSE RULE "Uitloggen" {+Een ingelogde user moet ook uit kunnen loggen, zodat zijn persoonlijke context wordt opgeruimd. Dat betekent concreet dat de session wordt verwijderd, waardoor ook alle session variabelen verdwijnen. Een user logt uit door zij Account van de session te ontkoppelen.+} ROLE ExecEngine MAINTAINS "Uitloggen" RULE "Uitloggen": - ('_SESSION'[SESSION] /\ -(sessionAccount;sessionAccount~)) + ("_SESSION"[SESSION] /\ -(sessionAccount;sessionAccount~)) |- -(firstSessionAccount;firstSessionAccount~) MEANING "De session is beëindigd." VIOLATION (TXT "{EX} DelAtom;SESSION;", SRC I) @@ -117,7 +117,7 @@ ENDPROCESS ----------------------------------------------------------- {- VIEW Accounts: Account(accUserid) -INTERFACE "Login_Logout" (loginUserid, loginPassword, sessionAccount): '_SESSION'[SESSION] +INTERFACE "Login_Logout" (loginUserid, loginPassword, sessionAccount): "_SESSION"[SESSION] TABS[ "Inloggen" : I /\ -(sessionAccount;sessionAccount~) COLS[ "UserID" : loginUserid , "Password" : loginPassword diff --git a/PRACO/GRC-AccountsAndSessions.adl b/PRACO/GRC-AccountsAndSessions.adl index 3ea4cd7a..bd9eb1ed 100644 --- a/PRACO/GRC-AccountsAndSessions.adl +++ b/PRACO/GRC-AccountsAndSessions.adl @@ -7,7 +7,7 @@ INTERFACE "Login" (loginUserid, loginPassword, sessionAccount , accRoles, accOrgUnit, accOrganization, accOrgFunction ) FOR Developer - : '_SESSION'[SESSION] + : "_SESSION"[SESSION] COLS[ "Classical" : I ROWS[ "UserID" : loginUserid , "Password" : loginPassword diff --git a/PRACO/GRC-RiskAnalysis.adl b/PRACO/GRC-RiskAnalysis.adl index 48d16774..34e518da 100644 --- a/PRACO/GRC-RiskAnalysis.adl +++ b/PRACO/GRC-RiskAnalysis.adl @@ -163,7 +163,7 @@ MEANING "Notes must have text and specify the author." ROLE ExecEngine MAINTAINS "Authoring Notes" RULE "Authoring Notes": I /\ noteText;noteText~ |- noteAuthor;noteAuthor~ MEANING "All notes that have texts must have an (authenticated) author" -VIOLATION (TXT "{EX} InsPair;noteAuthor;Note;", SRC I, TXT ";Person;", TGT V;'_SESSION'[SESSION];(sessionUser \/ (I /\ -(sessionUser;sessionUser~));V;'[not specified]'[Person])) +VIOLATION (TXT "{EX} InsPair;noteAuthor;Note;", SRC I, TXT ";Person;", TGT V;"_SESSION"[SESSION];(sessionUser \/ (I /\ -(sessionUser;sessionUser~));V;'[not specified]'[Person])) ENDPROCESS ----------------------------------------------------------- diff --git a/PRACO/PRACO.ifc b/PRACO/PRACO.ifc index 8fe5a7e1..7fb512ce 100644 --- a/PRACO/PRACO.ifc +++ b/PRACO/PRACO.ifc @@ -15,7 +15,7 @@ INTERFACE "Scope & Signals" , bfWantsToBeCompliantWithNorm , ctrlIsImpldByOblOfBF, ctrlCoversCtrl, ctrlSpecification, ctrlNAReason , ctrlIsAccepted, ctrlIsImplemented, ctrlIsEffective - ) : '_SESSION'[SESSION] + ) : "_SESSION"[SESSION] TABS[ "Current" : I ROWS[ "Selected
Scope" : scopeBF , "G(overnance)
Module" : I @@ -66,7 +66,7 @@ TABS[ "Current" : I INTERFACE "Obligations" ( ctrlIsOwnedByExpOfBF, ctrlSpecification, ctrlNAReason, ctrlKPI, ctrlOblRLI, ctrlIsAccepted, ctrlIsImplemented , ctrlIsImpldByOblOfBF, ctrlSpecification, ctrlNAReason, ctrlKEI, ctrlExpRLI, ctrlIsEffective - ) : '_SESSION'[SESSION];scopeOblCtrls;(ctrlIsSpecified /\ -ctrlIsInternal) + ) : "_SESSION"[SESSION];scopeOblCtrls;(ctrlIsSpecified /\ -ctrlIsInternal) COLS[ "ID" : I , "Accountable to" : ctrlIsOwnedByExpOfBF , "Obligation description" : ctrlSpecification @@ -80,7 +80,7 @@ COLS[ "ID" : I INTERFACE "Expectations" ( ctrlIsImpldByOblOfBF, ctrlSpecification, ctrlNAReason, ctrlKEI, ctrlExpRLI, ctrlIsEffective - ) : '_SESSION'[SESSION];scopeExpCtrls;(ctrlIsSpecified /\ -ctrlIsInternal) + ) : "_SESSION"[SESSION];scopeExpCtrls;(ctrlIsSpecified /\ -ctrlIsInternal) COLS[ "ID" : I -- als je hem niet moet kunnen linken: ctrlID , "KEI" : ctrlKEI , "Expectation description" : ctrlSpecification @@ -100,7 +100,7 @@ COLS[ "ID" : I -- als je hem niet moet kunnen linken: ctrlID INTERFACE "Internals" -- i.e. Obligations, as well as internal Controls ( ctrlSpecification, ctrlExpRLI, ctrlKPI, ctrlIsImplemented, ctrlOblRLI, ctrlKEI, ctrlIsEffective - ) : '_SESSION'[SESSION];scopeOblCtrls;ctrlIsSpecified + ) : "_SESSION"[SESSION];scopeOblCtrls;ctrlIsSpecified COLS[ "ID" : I , "O-Risk" : ctrlOblRLI , "E-Risk" : ctrlExpRLI @@ -115,7 +115,7 @@ COLS[ "ID" : I INTERFACE "Issues" ( ctrlIsOwnedByExpOfBF, ctrlSpecification, ctrlNAReason, ctrlKPI, ctrlOblRLI, ctrlIsAccepted, ctrlIsImplemented , ctrlIsImpldByOblOfBF, ctrlSpecification, ctrlNAReason, ctrlKEI, ctrlExpRLI, ctrlIsEffective - ) : '_SESSION'[SESSION] + ) : "_SESSION"[SESSION] TABS[ "Expectation Issues": scopeExpCtrls;ctrlIsAnIssue BOX [ "ID" : I , "Issue with": ctrlIsImpldByOblOfBF @@ -146,7 +146,7 @@ INTERFACE "Discussion Agenda" ( ctrlIsOwnedByExpOfBF, ctrlSpecification, ctrlNAReason, ctrlKPI, ctrlOblRLI, ctrlIsAccepted, ctrlIsImplemented , ctrlIsImpldByOblOfBF, ctrlSpecification, ctrlNAReason, ctrlKEI, ctrlExpRLI, ctrlIsEffective ) : I[BusinessFunction] -- a BF with whom we have expectation/obligation issues. - ROWS[ "Expectation
Issues": (ctrlIsImpldByOblOfBF~ /\ -I;scopeBF~;'_SESSION';scopeExpCtrls);ctrlIsAnIssue + ROWS[ "Expectation
Issues": (ctrlIsImpldByOblOfBF~ /\ -I;scopeBF~;"_SESSION";scopeExpCtrls);ctrlIsAnIssue BOX [ "ID" : I , "E-Risk" : ctrlExpRLI -- , "My scope": ctrlIsOwnedByExpOfBF @@ -157,7 +157,7 @@ INTERFACE "Discussion Agenda" , "N/A reason" : ctrlNAReason -- , "O-Risk" : ctrlOblRLI ] - , "Obligation
Acceptance": (ctrlIsOwnedByExpOfBF~ /\ -I;scopeBF~;'_SESSION';scopeOblCtrls);ctrlIsAnIssue + , "Obligation
Acceptance": (ctrlIsOwnedByExpOfBF~ /\ -I;scopeBF~;"_SESSION";scopeOblCtrls);ctrlIsAnIssue BOX [ "ID" : I -- , "O-Risk" : ctrlOblRLI , "Specification text" : I;ctrlSpecification @@ -174,7 +174,7 @@ INTERFACE "Obligation" (ctrlIsImpldByOblOfBF, ctrlCoversCtrl, ctrlSpecification, ctrlNAReason ,ctrlID, ctrlIsEffective ,ctrlIsOwnedByExpOfBF, ctrlID, ctrlSpecification, ctrlKEI, ctrlKPI, ctrlNorm, ctrlNAReason, ctrlIsEffective - ) : I[Control] /\ scopeOblCtrls~;'_SESSION';scopeOblCtrls + ) : I[Control] /\ scopeOblCtrls~;"_SESSION";scopeOblCtrls ROWS[ "Obligation" : I COLS[ "ID" : ctrlID , "Description" : ctrlSpecification @@ -207,7 +207,7 @@ INTERFACE "Obligation" INTERFACE "Expectation" ( ctrlID, ctrlIsImpldByOblOfBF, ctrlCoversCtrl, ctrlSpecification , ctrlKEI, ctrlIsEffective, ctrlKPI - ) : I[Control] /\ scopeExpCtrls~;'_SESSION';scopeExpCtrls + ) : I[Control] /\ scopeExpCtrls~;"_SESSION";scopeExpCtrls ROWS[ "Expectation" : I COLS[ "ID" : ctrlID , "KEI" : ctrlKEI @@ -248,12 +248,12 @@ ROWS[ "Norm": I -- , "Title": normFullID , "Text" : normtextText ] - , "N/A Reason" : ctrlNorm~;(I /\ V[Control*SESSION];'_SESSION';scopeBF;ctrlIsOwnedByExpOfBF~);ctrlIsNotApplicable + , "N/A Reason" : ctrlNorm~;(I /\ V[Control*SESSION];"_SESSION";scopeBF;ctrlIsOwnedByExpOfBF~);ctrlIsNotApplicable BOX [ "ID" : I[Control] , "N/A" : I , "Reason" : ctrlNAReason ] - , "Controls" : ctrlNorm~;(I /\ V[Control*SESSION];'_SESSION';scopeBF;ctrlIsOwnedByExpOfBF~);(I /\ -ctrlIsNotApplicable) + , "Controls" : ctrlNorm~;(I /\ V[Control*SESSION];"_SESSION";scopeBF;ctrlIsOwnedByExpOfBF~);(I /\ -ctrlIsNotApplicable) BOX [ "ID" : I , "O-Risk" : ctrlOblRLI , "E-Risk" : ctrlExpRLI @@ -268,15 +268,15 @@ ROWS[ "Norm": I -- BOX [ "Norm" : I , "Title": normFullID , "Text" : normtextText - , "N/A" : I /\ V;'_SESSION'[SESSION];scopeBF;normIsNotApplicableForBF~ - , "Reason" : (ctrlNorm~ /\ V[Norm*SESSION];'_SESSION';scopeBF;ctrlIsOwnedByExpOfBF~);ctrlNAReason + , "N/A" : I /\ V;"_SESSION"[SESSION];scopeBF;normIsNotApplicableForBF~ + , "Reason" : (ctrlNorm~ /\ V[Norm*SESSION];"_SESSION";scopeBF;ctrlIsOwnedByExpOfBF~);ctrlNAReason ] , "Sibling norms" : isSubsidiaryToNorm;isSubsidiaryToNorm~ /\ -I -- BOX [ "Norm" : I , "Title": normFullID , "Text" : normtextText - , "N/A" : I /\ V;'_SESSION'[SESSION];scopeBF;normIsNotApplicableForBF~ - , "Reason" : (ctrlNorm~ /\ V[Norm*SESSION];'_SESSION';scopeBF;ctrlIsOwnedByExpOfBF~);ctrlNAReason + , "N/A" : I /\ V;"_SESSION"[SESSION];scopeBF;normIsNotApplicableForBF~ + , "Reason" : (ctrlNorm~ /\ V[Norm*SESSION];"_SESSION";scopeBF;ctrlIsOwnedByExpOfBF~);ctrlNAReason ] , "Parent norm" : isSubsidiaryToNorm -- BOX [ "Norm" : I[Norm] @@ -378,7 +378,7 @@ VIEW RLIgauge: RLI DEFAULT , dvBelowBG : (rliType;dvRLIType~ /\ rliRisk;dvRisk~);dvBelowBG , dvAboveFG : (rliType;dvRLIType~ /\ rliRisk;dvRisk~);dvAboveFG , dvAboveBG : (rliType;dvRLIType~ /\ rliRisk;dvRisk~);dvAboveBG -, editable : I /\ rliBF;scopeBF~;'_SESSION';V +, editable : I /\ rliBF;scopeBF~;"_SESSION";V } HTML TEMPLATE "RLIgauge.html" ENDVIEW VIEW RLIshow: RLI @@ -394,7 +394,7 @@ VIEW RLIshow: RLI , dvBelowBG : (rliType;dvRLIType~ /\ rliRisk;dvRisk~);dvBelowBG , dvAboveFG : (rliType;dvRLIType~ /\ rliRisk;dvRisk~);dvAboveFG , dvAboveBG : (rliType;dvRLIType~ /\ rliRisk;dvRisk~);dvAboveBG -, editable : I /\ rliBF;scopeBF~;'_SESSION';V +, editable : I /\ rliBF;scopeBF~;"_SESSION";V } HTML TEMPLATE "RLIshow.html" ENDVIEW ------------------------------------------------------------ diff --git a/PRACO/include/templates/views/RLIgauge - Copy.html b/PRACO/include/templates/views/RLIgauge - Copy.html index ad2c2b96..d6034c4d 100644 --- a/PRACO/include/templates/views/RLIgauge - Copy.html +++ b/PRACO/include/templates/views/RLIgauge - Copy.html @@ -1,6 +1,6 @@
diff --git a/PRACO/include/templates/views/RLIshow.html b/PRACO/include/templates/views/RLIshow.html index 71b20e0a..00130655 100644 --- a/PRACO/include/templates/views/RLIshow.html +++ b/PRACO/include/templates/views/RLIshow.html @@ -13,7 +13,7 @@ , dvBelowBG : (rliType;dvRLIType~ /\ rliRisk;dvRisk~);dvBelowBG , dvAboveFG : (rliType;dvRLIType~ /\ rliRisk;dvRisk~);dvAboveFG , dvAboveBG : (rliType;dvRLIType~ /\ rliRisk;dvRisk~);dvAboveBG -, editable : I /\ rliBF;scopeBF~;'_SESSION';V +, editable : I /\ rliBF;scopeBF~;"_SESSION";V } HTML TEMPLATE "RLIgauge.html" ENDVIEW -->
diff --git a/RAP3/RAP3_AccountMgt.ifc b/RAP3/RAP3_AccountMgt.ifc index 8f8bb329..3a4cf5b2 100644 --- a/RAP3/RAP3_AccountMgt.ifc +++ b/RAP3/RAP3_AccountMgt.ifc @@ -14,15 +14,15 @@ RULE "Het UserID van een studentenaccount is het Studentnummer": accStudNr |- ac VIOLATION (TXT "{EX}InsPair;accUserid;Account;", SRC I, TXT ";UserID;", TGT I[UserID]) ROLE ExecEngine MAINTAINS "Accounts with a Studentnummer are assigned the role of 'Student'" -RULE "Accounts with a Studentnummer are assigned the role of 'Student'": accStudNr # 'Student'[Role] |- accAllowedRoles +RULE "Accounts with a Studentnummer are assigned the role of 'Student'": accStudNr # "Student"[Role] |- accAllowedRoles VIOLATION (TXT "{EX}InsPair;accAllowedRoles;Account;", SRC I, TXT ";Role;", TGT I) ROLE ExecEngine MAINTAINS "Accounts without a Studentnummer may not be assigned the role of 'Student'" -RULE "Accounts without a Studentnummer may not be assigned the role of 'Student'": accAllowedRoles;'Student' |- accStudNr;V +RULE "Accounts without a Studentnummer may not be assigned the role of 'Student'": accAllowedRoles;"Student" |- accStudNr;V VIOLATION (TXT "{EX}DelPair;accAllowedRoles;Account;", SRC I, TXT ";Role;", TGT I) --ROLE ExecEngine MAINTAINS "'Student' role is always a default role" ---RULE "'Student' role is always a default role": accAllowedRoles # 'Student'[Role] |- accDefaultRoles +--RULE "'Student' role is always a default role": accAllowedRoles # "Student"[Role] |- accDefaultRoles --VIOLATION (TXT "{EX}InsPair;accDefaultRoles;Account;", SRC I, TXT ";Role;", TGT I) --[Password (re)setting]-- @@ -32,26 +32,26 @@ RULE "Het default wachtwoord voor accounts is 'welkom'": I[Account] |- accPasswo VIOLATION (TXT "{EX}InsPair;accPassword;Account;", SRC I, TXT ";Password;welkom") ROLE User MAINTAINS "Wilt u uw wachtwoord veranderen?" -RULE "Wilt u uw wachtwoord veranderen?": '_SESSION';sessionAccount;accPassword;'welkom' |- -V +RULE "Wilt u uw wachtwoord veranderen?": "_SESSION";sessionAccount;accPassword;"welkom" |- -V MESSAGE "Het wachtwoord 'welkom' dient te worden aangepast." VIOLATION (TXT "U dient uw wachtwoord te wijzigen in de interface 'My Account' in de menubalk.") accNewPassword :: Account * Password [UNI] ROLE ExecEngine MAINTAINS "(Re)set the password of an account" RULE "(Re)set the password of an account": - accNewPassword /\ (sessionAccount \/ sessionActiveRoles;'AccountMgr';V)~;'_SESSION';V |- -V + accNewPassword /\ (sessionAccount \/ sessionActiveRoles;"AccountMgr";V)~;"_SESSION";V |- -V MEANING "(Re)setting the password for an account can only be done by an AccountMgr or the account user." VIOLATION (TXT "{EX} InsPair;accPassword;Account;", SRC I, TXT ";Password;", TGT I ,TXT "{EX} DelPair;accNewPassword;Account;", SRC I, TXT ";Password;", TGT I ) RULE "(Re)setting the password for an account can only be done by an AccountMgr or the account user": - accNewPassword |- (sessionAccount \/ sessionActiveRoles;'AccountMgr';V)~;'_SESSION';V + accNewPassword |- (sessionAccount \/ sessionActiveRoles;"AccountMgr";V)~;"_SESSION";V --[AccountMgr Interfaces]-- POPULATION Role CONTAINS [ "AccountMgr" ] -INTERFACE "Accounts" FOR "AccountMgr": '_SESSION';V[SESSION*Account] cRud BOX +INTERFACE "Accounts" FOR "AccountMgr": "_SESSION";V[SESSION*Account] cRud BOX [ "Userid": I cRud LINKTO INTERFACE "Account" , "Person" : accPerson cRud , "Allowed roles": accAllowedRoles cRud @@ -68,7 +68,7 @@ INTERFACE "Account" FOR "AccountMgr": I[Account] cRud ROWS , "Default roles": accDefaultRoles cRUd ] -INTERFACE "Roles" FOR "AccountMgr": '_SESSION';V[SESSION*Role] CRUd BOX +INTERFACE "Roles" FOR "AccountMgr": "_SESSION";V[SESSION*Role] CRUd BOX [ "Role": I cRud , "Assigned to": accAllowedRoles~ cRUd , "Default for": accDefaultRoles~ cRUd @@ -76,8 +76,8 @@ INTERFACE "Roles" FOR "AccountMgr": '_SESSION';V[SESSION*Role] CRUd BOX --[User account management]-- -INTERFACE "My Account" FOR "User": '_SESSION' cRud BOX - [ "no session account": (I-(sessionAccount;sessionAccount~));V;'Editing your account requires that you are logged in'[LoginMessage] cRud +INTERFACE "My Account" FOR "User": "_SESSION" cRud BOX + [ "no session account": (I-(sessionAccount;sessionAccount~));V;"Editing your account requires that you are logged in"[LoginMessage] cRud , "session account": sessionAccount cRUd ROWS [ "Userid": accUserid cRud , "New password": accNewPassword crUd -- crUd is required for Passwords diff --git a/RAP3/RAP3_LoginForDevelopment.ifc b/RAP3/RAP3_LoginForDevelopment.ifc index 4d5c271c..001e8349 100644 --- a/RAP3/RAP3_LoginForDevelopment.ifc +++ b/RAP3/RAP3_LoginForDevelopment.ifc @@ -7,7 +7,7 @@ username and password. -} ----------------------------------------------------------- -INTERFACE "Login (DEV)": '_SESSION'[SESSION] cRud BOX +INTERFACE "Login (DEV)": "_SESSION"[SESSION] cRud BOX [ "Login" : (I-sessionAccount;sessionAccount~)-regCreateAccount cRud BOX [ "Userid": loginUserid cRUd , "Password": loginPassword crUd -- crUd is needed for Passwords diff --git a/RAP3/RAP3_LoginForProduction.ifc b/RAP3/RAP3_LoginForProduction.ifc index 776c1ba8..bd231a4d 100644 --- a/RAP3/RAP3_LoginForProduction.ifc +++ b/RAP3/RAP3_LoginForProduction.ifc @@ -1,7 +1,7 @@ CONTEXT "Login" IN ENGLISH LATEX ----------------------------------------------------------- -INTERFACE "Login": '_SESSION'[SESSION] cRud BOX +INTERFACE "Login": "_SESSION"[SESSION] cRud BOX [ "Login" : I-sessionAccount;sessionAccount~ cRud BOX [ "Userid": loginUserid cRUd , "Password": loginPassword crUd -- crUd is needed for Passwords diff --git a/RAP3/SIAM_Module-example.adl b/RAP3/SIAM_Module-example.adl index 3b8be2c4..dc1d0e8c 100644 --- a/RAP3/SIAM_Module-example.adl +++ b/RAP3/SIAM_Module-example.adl @@ -31,8 +31,8 @@ VIOLATION (TXT "The SIAM Module files that you have INCLUDEd have major version -- The following VIEW replaces 'dirty' SESSION identifiers with the text "My Session" or "Some other Session" VIEW Sessions: SESSION DEFAULT -{ "uid": '_SESSION'[SESSION];V;'My Session'[LoginMessage] - \/ (I[SESSION]-'_SESSION');V;'Some other Session'[LoginMessage] +{ "uid": "_SESSION"[SESSION];V;"My Session"[LoginMessage] + \/ (I[SESSION]-"_SESSION");V;"Some other Session"[LoginMessage] } ENDVIEW POPULATION LoginMessage CONTAINS [ "My Session", "Some other Session" ] diff --git a/RAP3/SIAM_importer.adl b/RAP3/SIAM_importer.adl index 24dd82f7..9fcb65b8 100644 --- a/RAP3/SIAM_importer.adl +++ b/RAP3/SIAM_importer.adl @@ -38,8 +38,8 @@ CONTEXT SIAMv2_1 IN ENGLISH -- SIAM: Sessions, Identity- and Access Management -- The following VIEW replaces 'dirty' SESSION identifiers with the text "My Session" or "Some other Session" VIEW Sessions: SESSION DEFAULT -{ "uid": '_SESSION'[SESSION];V;'My Session'[LoginMessage] - \/ (I[SESSION]-'_SESSION');V;'Some other Session'[LoginMessage] +{ "uid": "_SESSION"[SESSION];V;"My Session"[LoginMessage] + \/ (I[SESSION]-"_SESSION");V;"Some other Session"[LoginMessage] } ENDVIEW POPULATION LoginMessage CONTAINS [ "My Session", "Some other Session" ] diff --git a/RAP3/Scripts.adl b/RAP3/Scripts.adl index 457d6eb0..819ec9e5 100644 --- a/RAP3/Scripts.adl +++ b/RAP3/Scripts.adl @@ -39,12 +39,12 @@ RULE "Submission Timestamping": (I[Script]/\content;content~) |- submitted;V VIOLATION ( TXT "{EX} InsPair;submitted;Script;", SRC I, TXT ";DateTime;{php}date(DATE_ISO8601)" ) ROLE ExecEngine MAINTAINS "Submittor" -RULE "Submittor": I[Script]#('_SESSION'[SESSION];sessionAccount) |- submittor;V +RULE "Submittor": I[Script]#("_SESSION"[SESSION];sessionAccount) |- submittor;V VIOLATION ( TXT "{EX} InsPair;submittor;Script;", SRC I, TXT ";Account;", TGT I ) -- ROLE ExecEngine MAINTAINS "All accounts must have the role User" --- RULE "All accounts must have the role User" : newScript~;'_SESSION';sessionAccount |- accAllowedRoles +-- RULE "All accounts must have the role User" : newScript~;"_SESSION";sessionAccount |- accAllowedRoles -- VIOLATION (TXT "{EX}InsPair;accAllowedRoles;Account;", SRC I, TXT ";Role;", TGT I) diff --git a/RAP3/Scripts.ifc b/RAP3/Scripts.ifc index 178d7316..43ed34bb 100644 --- a/RAP3/Scripts.ifc +++ b/RAP3/Scripts.ifc @@ -1,13 +1,13 @@ CONTEXT RAP3 IN ENGLISH -INTERFACE MyScripts FOR User,Tutor,Student: '_SESSION';sessionAccount;submittor~ CRuD BOX +INTERFACE MyScripts FOR User,Tutor,Student: "_SESSION";sessionAccount;submittor~ CRuD BOX [ content : I cRud , opdracht : assignment , tijdstip : submitted cRud ] -- 20161111/RJ: Ik begrijp niet waartoe de (twee) expressies (I[Account]/\submittor~;submittor) in deze interface dienen. En (daarom?) ook niet wat de purpose van deze interface is. -INTERFACE StudentScripts FOR Tutor : '_SESSION'[SESSION]#(I[Account]/\submittor~;submittor) cRud BOX +INTERFACE StudentScripts FOR Tutor : "_SESSION"[SESSION]#(I[Account]/\submittor~;submittor) cRud BOX [ indiener : I/\submittor~;submittor cRud , scripts : submittor~ cRud BOX [ opdracht : assignment cRud diff --git a/RAP3/ace_ampersand_highlighter_rules.js b/RAP3/ace_ampersand_highlighter_rules.js index bacf3074..0035e447 100644 --- a/RAP3/ace_ampersand_highlighter_rules.js +++ b/RAP3/ace_ampersand_highlighter_rules.js @@ -43,7 +43,7 @@ var AmpersandHighlightRules = function() { // ,next : "start" } ,{ token : "keyword" // Specials - ,regex : "(\bExecEngine\b|\b{EX}\b|\b(InsPair|DelPair|NewStruct|DelAtom)\b|'ONE'|'_SESSION')\[SESSION\]|'_SESSION'|\bSESSION\b|\b_NEW\b)" + ,regex : "(\bExecEngine\b|\b{EX}\b|\b(InsPair|DelPair|NewStruct|DelAtom)\b|'ONE'|"_SESSION")\[SESSION\]|"_SESSION"|\bSESSION\b|\b_NEW\b)" // ,next : "start" } ,{ token : "operator" // V, I diff --git a/SIAM/SIAM.adl b/SIAM/SIAM.adl index 5c6ab1ed..a5d3a86d 100644 --- a/SIAM/SIAM.adl +++ b/SIAM/SIAM.adl @@ -35,8 +35,8 @@ INCLUDE "./_SIAM_pop.xlsx" -- Initial, minimal set of people and accounts -- The following VIEW replaces 'dirty' SESSION identifiers with the text "My Session" or "Some other Session" VIEW Sessions: SESSION DEFAULT -{ "uid": '_SESSION'[SESSION];V;'My Session'[LoginMessage] - \/ (I[SESSION]-'_SESSION');V;'Some other Session'[LoginMessage] +{ "uid": "_SESSION"[SESSION];V;"My Session"[LoginMessage] + \/ (I[SESSION]-"_SESSION");V;"Some other Session"[LoginMessage] } ENDVIEW POPULATION LoginMessage CONTAINS [ "My Session", "Some other Session" ] diff --git a/SIAM/SIAM_AccountManagement.ifc b/SIAM/SIAM_AccountManagement.ifc index 912a45ed..dc240a11 100644 --- a/SIAM/SIAM_AccountManagement.ifc +++ b/SIAM/SIAM_AccountManagement.ifc @@ -9,15 +9,15 @@ POPULATION Role CONTAINS [ "AccountMgr" ] RELATION accNewPassword[Account*Password] [UNI] ROLE ExecEngine MAINTAINS "(Re)set the password of an account" RULE "(Re)set the password of an account": - accNewPassword /\ (sessionAccount~ \/ V;'AccountMgr';sessionActiveRoles~);'_SESSION';V |- -V + accNewPassword /\ (sessionAccount~ \/ V;'AccountMgr';sessionActiveRoles~);"_SESSION";V |- -V MEANING "(Re)setting the password for an account can only be done by an AccountMgr or the account user." VIOLATION (TXT "{EX} InsPair;accPassword;Account;", SRC I, TXT ";Password;", TGT I ,TXT "{EX} DelPair;accNewPassword;Account;", SRC I, TXT ";Password;", TGT I ) RULE "(Re)setting the password for an account can only be done by an AccountMgr or the account user": - accNewPassword |- (sessionAccount~ \/ V;'AccountMgr';sessionActiveRoles~);'_SESSION';V + accNewPassword |- (sessionAccount~ \/ V;'AccountMgr';sessionActiveRoles~);"_SESSION";V -INTERFACE "Accounts" FOR "AccountMgr": '_SESSION';V[SESSION*Account] cRud BOX +INTERFACE "Accounts" FOR "AccountMgr": "_SESSION";V[SESSION*Account] cRud BOX [ "Userid": I cRUd LINKTO INTERFACE "Account" , "Person": accPerson cRUd , "Organization": accOrg cRUd @@ -36,7 +36,7 @@ INTERFACE "Account" FOR "AccountMgr": I[Account] cRUd ROWS , "Active?": accIsActive cRUd ] -INTERFACE "My Account": '_SESSION';sessionAccount cRUd ROWS +INTERFACE "My Account": "_SESSION";sessionAccount cRUd ROWS [ "Userid": accUserid cRUd , "New password": accNewPassword crUd -- crUd is needed for Passwords , "Person": accPerson cRud @@ -47,7 +47,7 @@ INTERFACE "My Account": '_SESSION';sessionAccount cRUd ROWS --[Roles]-- -INTERFACE "Roles" FOR "AccountMgr": '_SESSION';V[SESSION*Role] CRUd BOX +INTERFACE "Roles" FOR "AccountMgr": "_SESSION";V[SESSION*Role] CRUd BOX [ "Role": I cRud , "Assigned to": accAllowedRoles~ cRUd , "Default for": accDefaultRoles~ cRUd diff --git a/SIAM/SIAM_AutoLoginAccount.adl b/SIAM/SIAM_AutoLoginAccount.adl index d818cc5f..85a4db29 100644 --- a/SIAM/SIAM_AutoLoginAccount.adl +++ b/SIAM/SIAM_AutoLoginAccount.adl @@ -6,11 +6,11 @@ RELATION autoLoginAccount[Account*Account] [PROP] -- An account that has this pr RULE "AutoLoginAccounts must be active": autoLoginAccount |- accIsActive ROLE ExecEngine MAINTAINS "Automatically login" -RULE "Automatically login": autoLoginAccount /\ accIsActive /\ V;('_SESSION'-(sessionAccount;sessionAccount~));V |- -V -VIOLATION (TXT "{EX} InsPair;sessionAccount;SESSION;", SRC V;'_SESSION'[SESSION], TXT ";Account;", TGT I) +RULE "Automatically login": autoLoginAccount /\ accIsActive /\ V;("_SESSION"-(sessionAccount;sessionAccount~));V |- -V +VIOLATION (TXT "{EX} InsPair;sessionAccount;SESSION;", SRC V;"_SESSION"[SESSION], TXT ";Account;", TGT I) ROLE ExecEngine MAINTAINS "Disable automated login" -RULE "Disable automated login": autoLoginAccount /\ V;('_SESSION' /\ sessionAccount;sessionAccount~);V |- -V +RULE "Disable automated login": autoLoginAccount /\ V;("_SESSION" /\ sessionAccount;sessionAccount~);V |- -V VIOLATION (TXT "{EX} DelPair;autoLoginAccount;Account;", SRC I, TXT ";Account;", TGT I) ENDCONTEXT \ No newline at end of file diff --git a/SIAM/SIAM_Login.adl b/SIAM/SIAM_Login.adl index 72c3062c..7dddbc5d 100644 --- a/SIAM/SIAM_Login.adl +++ b/SIAM/SIAM_Login.adl @@ -87,7 +87,7 @@ VIOLATION (TXT "{EX} InsPair;sessionAccount;SESSION;", SRC I, TXT ";Account;", T ) ROLE ExecEngine MAINTAINS "Logout" -RULE "Logout": '_SESSION';logoutRequest |- -V +RULE "Logout": "_SESSION";logoutRequest |- -V MEANING "A request to logout in a session must be processed in that session." VIOLATION (TXT "{EX} DelAtom;SESSION;", SRC I) diff --git a/SIAM/SIAM_Login.ifc b/SIAM/SIAM_Login.ifc index abd7204a..4861f3e4 100644 --- a/SIAM/SIAM_Login.ifc +++ b/SIAM/SIAM_Login.ifc @@ -1,7 +1,7 @@ CONTEXT "Login" IN ENGLISH LATEX ----------------------------------------------------------- -INTERFACE "Login (plain)": '_SESSION'[SESSION] cRud BOX +INTERFACE "Login (plain)": "_SESSION"[SESSION] cRud BOX [ "Login": I - sessionAccount;sessionAccount~ cRud BOX [ "Userid" : loginUserid cRUd , "Password": loginPassword crUd -- crUd is needed for Passwords diff --git a/SIAM/SIAM_LoginAndRegisterUsingButtons.ifc b/SIAM/SIAM_LoginAndRegisterUsingButtons.ifc index 04ac3201..45966cc6 100644 --- a/SIAM/SIAM_LoginAndRegisterUsingButtons.ifc +++ b/SIAM/SIAM_LoginAndRegisterUsingButtons.ifc @@ -27,7 +27,7 @@ VIEW STRONG: IfcText HTML TEMPLATE "STRONG.html" ENDVIEW REPRESENT IfcText TYPE ALPHANUMERIC POPULATION IfcText CONTAINS [ "Auth. level ="] -INTERFACE "Login/Register": '_SESSION'[SESSION] cRud BOX +INTERFACE "Login/Register": "_SESSION"[SESSION] cRud BOX [ "A user is logged in": I[SESSION] /\ sessionAccount;sessionAccount~ cRud BOX [ "Row:Logout Buttons": I[SESSION] cRud BOX [ "Logout" : I[SESSION] cRud BOX [ property : logoutRequest cRUd ] @@ -42,7 +42,7 @@ INTERFACE "Login/Register": '_SESSION'[SESSION] cRud BOX , "Row:AlternateLogin": sessionLogoutAssist cRud BOX [ "Active accounts": V;accIsActive cRud INTERFACE "ShowAcc" ] ] -, "No user is logged in": '_SESSION'-(sessionAccount;sessionAccount~) cRud BOX +, "No user is logged in": "_SESSION"-(sessionAccount;sessionAccount~) cRud BOX [ "Row:Login": I[SESSION]-sessionSRI cRud BOX [ "Login": I[SESSION] {-INTERFACE "{U/PW Login}"-} cRud COLS [ "Userid": loginUserid cRUd @@ -60,7 +60,7 @@ INTERFACE "Login/Register": '_SESSION'[SESSION] cRud BOX , "Your organization" : registerOrgRef cRUd , " ": I cRud BOX [ "Register" : I cRud BOX - [ disabled : '_SESSION' - -- The button is disabled when we have a session without + [ disabled : "_SESSION" - -- The button is disabled when we have a session without ( loginUserid;loginUserid~ -- a specified userid /\ registerPassword;registerPassword~ -- a specified password /\ sessionPersonRef;sessionPersonRef~ -- and a specified user's name. diff --git a/SIAM/SIAM_LoginWithAssistance.ifc b/SIAM/SIAM_LoginWithAssistance.ifc index c44d309a..09150d94 100644 --- a/SIAM/SIAM_LoginWithAssistance.ifc +++ b/SIAM/SIAM_LoginWithAssistance.ifc @@ -14,7 +14,7 @@ ROLE ExecEngine MAINTAINS "Reset login help" RULE "Reset login help": sessionLoginAssist /\ sessionAccount;sessionAccount~ |- -V VIOLATION (TXT "{EX} DelPair;sessionLoginAssist;SESSION;", SRC I, TXT ";SESSION;", TGT I) -INTERFACE "Login (Assisted)": '_SESSION'[SESSION] cRud BOX +INTERFACE "Login (Assisted)": "_SESSION"[SESSION] cRud BOX [ "Login": I-(sessionAccount;sessionAccount~) cRud BOX [ "Userid": loginUserid cRUd , "Password": loginPassword crUd -- crUd is needed for Passwords diff --git a/SIAM/SIAM_LoginWithAssistanceAndAuthLevels.ifc b/SIAM/SIAM_LoginWithAssistanceAndAuthLevels.ifc index 38be1c3c..d0a1d6d1 100644 --- a/SIAM/SIAM_LoginWithAssistanceAndAuthLevels.ifc +++ b/SIAM/SIAM_LoginWithAssistanceAndAuthLevels.ifc @@ -14,7 +14,7 @@ ROLE ExecEngine MAINTAINS "Reset login help" RULE "Reset login help": sessionLoginAssist /\ sessionAccount;sessionAccount~ |- -V VIOLATION (TXT "{EX} DelPair;sessionLoginAssist;SESSION;", SRC I, TXT ";SESSION;", TGT I) -INTERFACE "Login (ALvLs)": '_SESSION'[SESSION] cRud BOX +INTERFACE "Login (ALvLs)": "_SESSION"[SESSION] cRud BOX [ "Login": I-(sessionAccount;sessionAccount~) cRud BOX [ "Userid": loginUserid cRUd , "Password": loginPassword crUd -- crUd is needed for Passwords diff --git a/SIAM/SIAM_LoginWithIdP.ifc b/SIAM/SIAM_LoginWithIdP.ifc index 6ba49ebd..7f4e08a5 100644 --- a/SIAM/SIAM_LoginWithIdP.ifc +++ b/SIAM/SIAM_LoginWithIdP.ifc @@ -3,7 +3,7 @@ CONTEXT "LoginWithIdP" IN ENGLISH LATEX PURPOSE CONTEXT "LoginWithIdP" {+This context provides the stuff that is needed to call an (external) IdP for doing the authentication for us.+} -INTERFACE "LoginWithIdP": '_SESSION'[SESSION]-(sessionAccount;sessionAccount~) cRud BOX +INTERFACE "LoginWithIdP": "_SESSION"[SESSION]-(sessionAccount;sessionAccount~) cRud BOX [ "Userid" : loginUserid cRUd , "IdP" : loginIdP cRUd , "LoA" : loginAuthISOLevel cRUd diff --git a/SIAM/SIAM_Module-example.adl b/SIAM/SIAM_Module-example.adl index b22b76aa..55076370 100644 --- a/SIAM/SIAM_Module-example.adl +++ b/SIAM/SIAM_Module-example.adl @@ -31,8 +31,8 @@ VIOLATION (TXT "The SIAM Module files that you have INCLUDEd have major version -- The following VIEW replaces 'dirty' SESSION identifiers with the text "My Session" or "Some other Session" VIEW Sessions: SESSION DEFAULT -{ "uid": '_SESSION'[SESSION];V;'My Session'[LoginMessage] - \/ (I[SESSION]-'_SESSION');V;'Some other Session'[LoginMessage] +{ "uid": "_SESSION"[SESSION];V;"My Session"[LoginMessage] + \/ (I[SESSION]-"_SESSION");V;"Some other Session"[LoginMessage] } ENDVIEW POPULATION LoginMessage CONTAINS [ "My Session", "Some other Session" ] diff --git a/SIAM/SIAM_PersonReg.ifc b/SIAM/SIAM_PersonReg.ifc index 836a0958..0ab23e22 100644 --- a/SIAM/SIAM_PersonReg.ifc +++ b/SIAM/SIAM_PersonReg.ifc @@ -20,7 +20,7 @@ INTERFACE "People" FOR "Person Manager": V[SESSION*Person] cRUD COLS , "Account" : accPerson~ cRud ] -INTERFACE "Me": '_SESSION';sessionPerson cRUd COLS +INTERFACE "Me": "_SESSION";sessionPerson cRUd COLS [ "First name": personFirstName cRUd , "Last name" : personLastName cRUd , "Account" : accPerson~ cRud diff --git a/SIAM/SIAM_Roles.ifc b/SIAM/SIAM_Roles.ifc index 5a4bab64..1f55e4b7 100644 --- a/SIAM/SIAM_Roles.ifc +++ b/SIAM/SIAM_Roles.ifc @@ -1,6 +1,6 @@ CONTEXT "Roles" IN ENGLISH -INTERFACE "Roles" FOR "Account manager": '_SESSION';V[SESSION*Role] CRuD BOX +INTERFACE "Roles" FOR "Account manager": "_SESSION";V[SESSION*Role] CRuD BOX [ "Role": I cRud , "Assigned to": accAllowedRoles~ cRud , "Default for": accDefaultRoles~ cRud diff --git a/SIAM/SIAM_SessionSuspension.adl b/SIAM/SIAM_SessionSuspension.adl index edac66ea..20707ae9 100644 --- a/SIAM/SIAM_SessionSuspension.adl +++ b/SIAM/SIAM_SessionSuspension.adl @@ -9,14 +9,14 @@ MEANING "The Account that is authenticated first in a session, must be remembere ROLE ExecEngine MAINTAINS "Registering the first authenticated session account" RULE "Registering the first authenticated session account": - ('_SESSION'[SESSION] - (firstSessionAccount;firstSessionAccount~));sessionAccount |- firstSessionAccount + ("_SESSION"[SESSION] - (firstSessionAccount;firstSessionAccount~));sessionAccount |- firstSessionAccount MEANING "Any account may be used to log into a session for the first time." VIOLATION (TXT "{EX} InsPair;firstSessionAccount;SESSION;", SRC I, TXT ";Account;", TGT I) PURPOSE RULE "Integrity of session accounts" {+At most one user may log into any session so as to guarantee that it is unambiguously clear which account was used for doing things in the system.+} RULE "Integrity of session accounts": - ('_SESSION'[SESSION] /\ firstSessionAccount;firstSessionAccount~);sessionAccount |- firstSessionAccount + ("_SESSION"[SESSION] /\ firstSessionAccount;firstSessionAccount~);sessionAccount |- firstSessionAccount MEANING "At most one account may be activated in any session." MESSAGE "The session has a known user; only the original user can login with (correct) credentials." VIOLATION (TXT "User '", SRC firstSessionAccount;accUserid, TXT "' was logged in.") diff --git a/SIAM/SIAM_v3preview.adl b/SIAM/SIAM_v3preview.adl index ac5f03e2..296c838d 100644 --- a/SIAM/SIAM_v3preview.adl +++ b/SIAM/SIAM_v3preview.adl @@ -130,7 +130,7 @@ VIOLATION (TXT "{EX} InsPair;sessionAccount;SESSION;", SRC I, TXT ";Account;", T ) {- Leave this interface out, until we can correctly (de)populate the menu bar with our items -INTERFACE "{U/PW Login}": '_SESSION'[SESSION] cRud COLS +INTERFACE "{U/PW Login}": "_SESSION"[SESSION] cRud COLS [ "Userid": loginUserid cRUd , "Password": loginPassword crUd -- crUd is needed for Passwords , " ": I cRud BOX diff --git a/SIAM/xxxxxxSIAM_LoginWithAssistanceAndAuthLevels.ifc b/SIAM/xxxxxxSIAM_LoginWithAssistanceAndAuthLevels.ifc index 38be1c3c..d0a1d6d1 100644 --- a/SIAM/xxxxxxSIAM_LoginWithAssistanceAndAuthLevels.ifc +++ b/SIAM/xxxxxxSIAM_LoginWithAssistanceAndAuthLevels.ifc @@ -14,7 +14,7 @@ ROLE ExecEngine MAINTAINS "Reset login help" RULE "Reset login help": sessionLoginAssist /\ sessionAccount;sessionAccount~ |- -V VIOLATION (TXT "{EX} DelPair;sessionLoginAssist;SESSION;", SRC I, TXT ";SESSION;", TGT I) -INTERFACE "Login (ALvLs)": '_SESSION'[SESSION] cRud BOX +INTERFACE "Login (ALvLs)": "_SESSION"[SESSION] cRud BOX [ "Login": I-(sessionAccount;sessionAccount~) cRud BOX [ "Userid": loginUserid cRUd , "Password": loginPassword crUd -- crUd is needed for Passwords diff --git a/Sequences/SeqItemNumbering.ifc b/Sequences/SeqItemNumbering.ifc index 0fc338af..af8a3b88 100644 --- a/Sequences/SeqItemNumbering.ifc +++ b/Sequences/SeqItemNumbering.ifc @@ -1,6 +1,6 @@ CONTEXT "SeqItemNumberingInterface" IN ENGLISH -INTERFACE "SeqItemNumbering": '_SESSION' cRud ROWS +INTERFACE "SeqItemNumbering": "_SESSION" cRud ROWS [ "New Sequence" : sessionNewSeq cRUd , "Sequences" : V[SESSION*Sequence] cRud COLS [ "Sequence name" : seqName cRud diff --git a/Sequences/SeqItemTexts.ifc b/Sequences/SeqItemTexts.ifc index b90e39bb..b8118428 100644 --- a/Sequences/SeqItemTexts.ifc +++ b/Sequences/SeqItemTexts.ifc @@ -1,6 +1,6 @@ CONTEXT SeqItemTextsInterface IN ENGLISH -INTERFACE "SeqItemTexts": '_SESSION' cRud ROWS +INTERFACE "SeqItemTexts": "_SESSION" cRud ROWS [ "New Sequence" : sessionNewSeq cRUd , "Sequences" : V[SESSION*Sequence] COLS [ "Sequence name" : seqName cRud diff --git a/Sequences/SeqItems.ifc b/Sequences/SeqItems.ifc index 6ab62a41..e721cce7 100644 --- a/Sequences/SeqItems.ifc +++ b/Sequences/SeqItems.ifc @@ -6,7 +6,7 @@ INTERFACE "SeqItems" ,itemInsNextItem, itemInsPrevItem ,itemNewNextItem, itemNewPrevItem ,itemRmvReq, itemDelReq - ) : '_SESSION' cRud ROWS + ) : "_SESSION" cRud ROWS [ "New Sequence" : sessionNewSeq cRUd , "Sequences" : V[SESSION*Sequence] COLS [ "Sequence name" : seqName cRud diff --git a/Sequences/SeqTextPhrases.ifc b/Sequences/SeqTextPhrases.ifc index 6f2b9bf8..eaa1eb9b 100644 --- a/Sequences/SeqTextPhrases.ifc +++ b/Sequences/SeqTextPhrases.ifc @@ -7,7 +7,7 @@ INTERFACE "TextConstructs": V[SESSION*TextConstruct] cRud COLS , "tcResult" : tcResult cRUd ] -INTERFACE "SeqTextPhrases": '_SESSION' cRud ROWS +INTERFACE "SeqTextPhrases": "_SESSION" cRud ROWS [ "New Sequence" : sessionNewSeq cRUd , "Sequences" : V[SESSION*Sequence] cRud COLS [ "Sequence name" : seqName cRud diff --git a/TText/Assignments.ifc b/TText/Assignments.ifc index af4e45eb..f8cfc402 100644 --- a/TText/Assignments.ifc +++ b/TText/Assignments.ifc @@ -3,7 +3,7 @@ VIEW Assignments: Assignment( asmVar;ttName, TXT " = '", asmVal, TXT "'" ) VIEW AssignmentCheckbox: Assignment HTML TEMPLATE "View-PROPERTY.html" ENDVIEW -- Enable Assignment-properties to be shown as checkboxes -INTERFACE "[Assignments]": '_SESSION'[SESSION] cRud COLS +INTERFACE "[Assignments]": "_SESSION"[SESSION] cRud COLS [ "Current Assignments (Traces)" : V[SESSION*Assignment];(I /\ ttTrace~;ttTrace) cRud BOX [ "asmVar" : asmVar cRud LINKTO INTERFACE "TText" , "asmVal" : asmVal cRud diff --git a/TText/SIAM_Module.adl b/TText/SIAM_Module.adl index c50005d6..023b1055 100644 --- a/TText/SIAM_Module.adl +++ b/TText/SIAM_Module.adl @@ -83,7 +83,7 @@ RULE "Auto DelPair sessionSIA": sessionSIA |- V;(I-accIsActive);V VIOLATION (TXT "{EX} DelPair;sessionSIA;SESSION;", SRC I, TXT ";SESSION;", TGT I) POPULATION IfcText CONTAINS [ "Auth. level ="] -INTERFACE "Login/Register": '_SESSION'[SESSION] cRud BOX +INTERFACE "Login/Register": "_SESSION"[SESSION] cRud BOX [ "A user is logged in": I[SESSION] /\ sessionAccount;sessionAccount~ cRud BOX [ "Row:Logout Buttons": I[SESSION] cRud BOX [ "Logout" : I[SESSION] cRud BOX [ property : logoutRequest cRUd ] @@ -98,7 +98,7 @@ INTERFACE "Login/Register": '_SESSION'[SESSION] cRud BOX , "Row:AlternateLogin": sessionLogoutAssist cRud BOX [ "Active accounts": V;accIsActive cRud INTERFACE "ShowAcc" ] ] -, "No user is logged in": '_SESSION'-(sessionAccount;sessionAccount~) cRud BOX +, "No user is logged in": "_SESSION"-(sessionAccount;sessionAccount~) cRud BOX [ "Row:Login": I[SESSION]-sessionSRI cRud BOX [ "Login": I[SESSION] {-INTERFACE "{U/PW Login}"-} cRud COLS [ "Userid": loginUserid cRUd @@ -116,7 +116,7 @@ INTERFACE "Login/Register": '_SESSION'[SESSION] cRud BOX , "Your organization" : registerOrgRef cRUd , " ": I cRud BOX [ "Register" : I cRud BOX - [ disabled : '_SESSION' - -- The button is disabled when we have a session without + [ disabled : "_SESSION" - -- The button is disabled when we have a session without ( loginUserid;loginUserid~ -- a specified userid /\ registerPassword;registerPassword~ -- a specified password /\ sessionPersonRef;sessionPersonRef~ -- and a specified user's name. diff --git a/TText/Scope_SIAM_Extensions.adl b/TText/Scope_SIAM_Extensions.adl index 06632a0f..d3678fb2 100644 --- a/TText/Scope_SIAM_Extensions.adl +++ b/TText/Scope_SIAM_Extensions.adl @@ -6,7 +6,7 @@ INCLUDE "../TText/SIAM_Module.adl" -- Sessions, Identity & Access Management fac scopeOwner :: Scope * Account [UNI] -- The Account that is authorized to change and/or delete the Scope. ROLE ExecEngine MAINTAINS "Set default Scope ownership" RULE "Set default Scope ownership": - (I[Scope]-scopeOwner;scopeOwner~);V;'_SESSION';sessionAccount |- scopeOwner + (I[Scope]-scopeOwner;scopeOwner~);V;"_SESSION";sessionAccount |- scopeOwner MEANING "Ownership of a Scope is assigned by default to the Account that has created the Scope" VIOLATION (TXT "{EX} InsPair;scopeOwner;Scope;", SRC I, TXT ";Account;", TGT I) diff --git a/TText/TText_SIAM_Extensions.adl b/TText/TText_SIAM_Extensions.adl index 8d897183..e4ba0e2f 100644 --- a/TText/TText_SIAM_Extensions.adl +++ b/TText/TText_SIAM_Extensions.adl @@ -6,7 +6,7 @@ INCLUDE "../TText/SIAM_Module.adl" -- Sessions, Identity & Access Management fac ttOwner :: TText * Account [UNI] -- The Account that is authorized to change and/or delete the TText. ROLE ExecEngine MAINTAINS "Set default TText ownership" RULE "Set default TText ownership": - (I[TText]-ttOwner;ttOwner~);V;'_SESSION';sessionAccount |- ttOwner + (I[TText]-ttOwner;ttOwner~);V;"_SESSION";sessionAccount |- ttOwner MEANING "Ownership of a TText is automatically assigned to the Account that has created the TText" VIOLATION (TXT "{EX} InsPair;ttOwner;TText;", SRC I, TXT ";Account;", TGT I) diff --git a/VOGDemo/IFC-Aanvrager.ifc b/VOGDemo/IFC-Aanvrager.ifc index 454473bb..57f75d8e 100644 --- a/VOGDemo/IFC-Aanvrager.ifc +++ b/VOGDemo/IFC-Aanvrager.ifc @@ -10,7 +10,7 @@ ROLE aanvrager MAINTAINS "Kleine aanvragers" ENDPROCESS ----------------------------------------------------------- INTERFACE "Mijn VOG Aanvragen" FOR Aanvrager, aanvrager : I[ONE] -- Dit is een zaakoverzicht -BOX[ "Welkom" : V[ONE*SESSION];'_SESSION'; +BOX[ "Welkom" : V[ONE*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'DigiD';idmSoort~) -- met een DigiD ;idmDisplayName -- dan laten we de displayName zien @@ -31,7 +31,7 @@ BOX[ "Welkom" : V[ONE*SESSION];'_SESSION'; /\ vogAanvragerIDVastgesteld;vogAanvragerIDVastgesteld~ );(vogAanvragerIDMSoort;idmSoort~ /\ vogAanvragerIDMNummer;idmNummer~) ) - ;idmUserid;sessionUserid~;'_SESSION';sessionUserid;idmUserid~; + ;idmUserid;sessionUserid~;"_SESSION";sessionUserid;idmUserid~; ( (vogAanvragerUserid;idmUserid~ /\ vogAanvragerPassword;idmPassword~);(I /\ idmSoort;'DigiD';idmSoort~) \/ aanvragerEmailAddress;idmEmailAddress~ \/ (I /\ gemVOGAanvraag~;({-gemAmbtenaarHandtekening-}(gemAmbtenaarDigitaleHandtekening;idmDigitaleHandtekening~ /\ gemAmbtenaarPasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening);({-gemAmbtenaarHandtekening-}(gemAmbtenaarDigitaleHandtekening;idmDigitaleHandtekening~ /\ gemAmbtenaarPasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening)~;gemVOGAanvraag @@ -67,7 +67,7 @@ BOX[ "Welkom" : V[ONE*SESSION];'_SESSION'; (I /\ vogAfgifteBesluit;'Nee';vogAfgifteBesluit~ );vogAanvraagOrganisatieTemplate ] - , "Ingelogde Aanvrager" : V[ONE*SESSION];'_SESSION'; + , "Ingelogde Aanvrager" : V[ONE*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'DigiD';idmSoort~) -- met een DigiD ;idmDisplayName -- dan laten we de displayName zien @@ -81,7 +81,7 @@ BOX[ "Welkom" : V[ONE*SESSION];'_SESSION'; ----------------------------------------------------------- {- INTERFACE "Mijn Procesoverzicht" FOR Aanvrager, aanvrager : I[ONE] -- Dit is een procesoverzicht -BOX[ "Welkom" : V[ONE*SESSION];'_SESSION';((sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~);idmDisplayName \/ (I /\ -(sessionUserid;sessionUserid~));V;'DigiD'[Berichtje];loginMet) +BOX[ "Welkom" : V[ONE*SESSION];"_SESSION";((sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~);idmDisplayName \/ (I /\ -(sessionUserid;sessionUserid~));V;'DigiD'[Berichtje];loginMet) , "Invullen en ondertekenen" : V[ONE*VOGAanvraag]; (I /\ -(({-aanvragerHandtekening-}(aanvragerDigitaleHandtekening;idmDigitaleHandtekening~ /\ aanvragerPasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening);({-aanvragerHandtekening-}(aanvragerDigitaleHandtekening;idmDigitaleHandtekening~ /\ aanvragerPasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening)~) @@ -93,7 +93,7 @@ BOX[ "Welkom" : V[ONE*SESSION];'_SESSION';((sessionUserid;idmUserid~ /\ sessionP /\ vogAanvragerIDVastgesteld;vogAanvragerIDVastgesteld~ );(vogAanvragerIDMSoort;idmSoort~ /\ vogAanvragerIDMNummer;idmNummer~) ) - ;idmUserid;sessionUserid~;'_SESSION';sessionUserid;idmUserid~; + ;idmUserid;sessionUserid~;"_SESSION";sessionUserid;idmUserid~; ( (vogAanvragerUserid;idmUserid~ /\ vogAanvragerPassword;idmPassword~);(I /\ idmSoort;'DigiD';idmSoort~) \/ aanvragerEmailAddress;idmEmailAddress~ \/ (I /\ gemVOGAanvraag~;({-gemAmbtenaarHandtekening-}(gemAmbtenaarDigitaleHandtekening;idmDigitaleHandtekening~ /\ gemAmbtenaarPasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening);({-gemAmbtenaarHandtekening-}(gemAmbtenaarDigitaleHandtekening;idmDigitaleHandtekening~ /\ gemAmbtenaarPasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening)~;gemVOGAanvraag @@ -118,7 +118,7 @@ BOX[ "Welkom" : V[ONE*SESSION];'_SESSION';((sessionUserid;idmUserid~ /\ sessionP /\ vogAanvragerIDVastgesteld;vogAanvragerIDVastgesteld~ );(vogAanvragerIDMSoort;idmSoort~ /\ vogAanvragerIDMNummer;idmNummer~) ) - ;idmUserid;sessionUserid~;'_SESSION';sessionUserid;idmUserid~; + ;idmUserid;sessionUserid~;"_SESSION";sessionUserid;idmUserid~; ( (vogAanvragerUserid;idmUserid~ /\ vogAanvragerPassword;idmPassword~);(I /\ idmSoort;'DigiD';idmSoort~) \/ aanvragerEmailAddress;idmEmailAddress~ \/ (I /\ gemVOGAanvraag~;({-gemAmbtenaarHandtekening-}(gemAmbtenaarDigitaleHandtekening;idmDigitaleHandtekening~ /\ gemAmbtenaarPasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening);({-gemAmbtenaarHandtekening-}(gemAmbtenaarDigitaleHandtekening;idmDigitaleHandtekening~ /\ gemAmbtenaarPasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening)~;gemVOGAanvraag @@ -138,7 +138,7 @@ BOX[ "Welkom" : V[ONE*SESSION];'_SESSION';((sessionUserid;idmUserid~ /\ sessionP /\ vogAanvragerIDVastgesteld;vogAanvragerIDVastgesteld~ );(vogAanvragerIDMSoort;idmSoort~ /\ vogAanvragerIDMNummer;idmNummer~) ) - ;idmUserid;sessionUserid~;'_SESSION';sessionUserid;idmUserid~; + ;idmUserid;sessionUserid~;"_SESSION";sessionUserid;idmUserid~; ( (vogAanvragerUserid;idmUserid~ /\ vogAanvragerPassword;idmPassword~);(I /\ idmSoort;'DigiD';idmSoort~) \/ aanvragerEmailAddress;idmEmailAddress~ \/ (I /\ gemVOGAanvraag~;({-gemAmbtenaarHandtekening-}(gemAmbtenaarDigitaleHandtekening;idmDigitaleHandtekening~ /\ gemAmbtenaarPasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening);({-gemAmbtenaarHandtekening-}(gemAmbtenaarDigitaleHandtekening;idmDigitaleHandtekening~ /\ gemAmbtenaarPasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening)~;gemVOGAanvraag @@ -158,7 +158,7 @@ BOX[ "Welkom" : V[ONE*SESSION];'_SESSION';((sessionUserid;idmUserid~ /\ sessionP /\ vogAanvragerIDVastgesteld;vogAanvragerIDVastgesteld~ );(vogAanvragerIDMSoort;idmSoort~ /\ vogAanvragerIDMNummer;idmNummer~) ) - ;idmUserid;sessionUserid~;'_SESSION';sessionUserid;idmUserid~; + ;idmUserid;sessionUserid~;"_SESSION";sessionUserid;idmUserid~; ( (vogAanvragerUserid;idmUserid~ /\ vogAanvragerPassword;idmPassword~);(I /\ idmSoort;'DigiD';idmSoort~) \/ aanvragerEmailAddress;idmEmailAddress~ \/ (I /\ gemVOGAanvraag~;({-gemAmbtenaarHandtekening-}(gemAmbtenaarDigitaleHandtekening;idmDigitaleHandtekening~ /\ gemAmbtenaarPasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening);({-gemAmbtenaarHandtekening-}(gemAmbtenaarDigitaleHandtekening;idmDigitaleHandtekening~ /\ gemAmbtenaarPasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening)~;gemVOGAanvraag @@ -283,7 +283,7 @@ BOX[ "1. Invullen door Aanvrager" : I ] ] , "2. Invullen door organisatie / instelling die de VOG verlangt": vogAanvraagOrganisatieTemplate , "3. Heeft u de leges betaald?" : zijnDeLegesBetaald - , "Ingelogde Aanvrager" : V[VOGAanvraag*SESSION];'_SESSION'; + , "Ingelogde Aanvrager" : V[VOGAanvraag*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'DigiD';idmSoort~) -- met een DigiD ;idmDisplayName -- dan laten we de displayName zien @@ -311,7 +311,7 @@ INTERFACE "In behandeling" /\ vogAanvragerIDVastgesteld;vogAanvragerIDVastgesteld~ );(vogAanvragerIDMSoort;idmSoort~ /\ vogAanvragerIDMNummer;idmNummer~) ) - ;idmUserid;sessionUserid~;'_SESSION';sessionUserid;idmUserid~; + ;idmUserid;sessionUserid~;"_SESSION";sessionUserid;idmUserid~; ( (vogAanvragerUserid;idmUserid~ /\ vogAanvragerPassword;idmPassword~);(I /\ idmSoort;'DigiD';idmSoort~) \/ aanvragerEmailAddress;idmEmailAddress~ \/ (I /\ gemVOGAanvraag~;({-gemAmbtenaarHandtekening-}(gemAmbtenaarDigitaleHandtekening;idmDigitaleHandtekening~ /\ gemAmbtenaarPasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening);({-gemAmbtenaarHandtekening-}(gemAmbtenaarDigitaleHandtekening;idmDigitaleHandtekening~ /\ gemAmbtenaarPasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening)~;gemVOGAanvraag @@ -370,7 +370,7 @@ BOX[ "Contactgegevens": I , "Datum" : orgOndertekeningDatum , "Handtekening" : ({-organisatieHandtekening-}(organisatieDigitaleHandtekening;idmDigitaleHandtekening~ /\ organisatiePasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening) ] ] - , "Ingelogde Aanvrager" : V[VOGAanvraag*SESSION];'_SESSION'; + , "Ingelogde Aanvrager" : V[VOGAanvraag*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'DigiD';idmSoort~) -- met een DigiD ;idmDisplayName -- dan laten we de displayName zien diff --git a/VOGDemo/IFC-COVOG.ifc b/VOGDemo/IFC-COVOG.ifc index 6e0bd1d6..a1dfec69 100644 --- a/VOGDemo/IFC-COVOG.ifc +++ b/VOGDemo/IFC-COVOG.ifc @@ -6,7 +6,7 @@ Het proces loopt grofweg als volgt. Nadat is vastgesteld dat er een vergoeding ( -} ------------------------------------------------------------ INTERFACE "Overzicht (COVOG)" FOR COVOG : I[ONE] -BOX[ "COVOG medewerker" : V[ONE*SESSION];'_SESSION'; +BOX[ "COVOG medewerker" : V[ONE*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'Rijkspas';idmSoort~) -- met een Rijkspas ;idmDisplayName -- dan laten we de displayName zien @@ -84,7 +84,7 @@ BOX[ "COVOG zaaknummer" : covogZaakNummer , "Aanvrager" : ((vogAanvragerUserid;idmUserid~ /\ vogAanvragerPassword;idmPassword~) \/ (vogAanvragerIDMSoort;idmSoort~ /\ vogAanvragerIDMNummer;idmNummer~));idmDisplayName , "Leges zijn betaald door aanvrager" : zijnDeLegesBetaald , "Leges zijn betaald via de gemeente" : gemVOGAanvraag~;gemLegesBetaald - , "Ingelogde COVOG ambtenaar" : V[VOGAanvraag*SESSION];'_SESSION'; + , "Ingelogde COVOG ambtenaar" : V[VOGAanvraag*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'Rijkspas';idmSoort~) -- met een Rijkspas ;idmDisplayName -- dan laten we de displayName zien @@ -173,7 +173,7 @@ BOX[ "COVOG zaaknummer" : covogZaakNummer , "Is, gezien het voorafgaande, de aanvraag ontvankelijk?" : isAanvraagOntvankelijk , "Motivatie (indien wordt afgeweken van het beleid)" : covogOntvankelijkheidMotivatie - , "Ingelogde COVOG ambtenaar" : V[VOGAanvraag*SESSION];'_SESSION'; + , "Ingelogde COVOG ambtenaar" : V[VOGAanvraag*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'Rijkspas';idmSoort~) -- met een Rijkspas ;idmDisplayName -- dan laten we de displayName zien @@ -395,7 +395,7 @@ BOX[ "VOG Zaaknummer" : covogZaakNummer -} ) , "Wordt de VOG afgegeven?" : vogAfgifteBesluit - , "Ingelogde COVOG ambtenaar" : V[VOGAanvraag*SESSION];'_SESSION'; + , "Ingelogde COVOG ambtenaar" : V[VOGAanvraag*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'Rijkspas';idmSoort~) -- met een Rijkspas ;idmDisplayName -- dan laten we de displayName zien @@ -512,7 +512,7 @@ BOX[ "VOG Zaaknummer" : covogZaakNummer , "Datum" : aanvragerOndertekeningDatum , "Handtekening" : ({-aanvragerHandtekening-}(aanvragerDigitaleHandtekening;idmDigitaleHandtekening~ /\ aanvragerPasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening) ] ] - , "Ingelogde COVOG ambtenaar" : V[VOGAanvraag*SESSION];'_SESSION'; + , "Ingelogde COVOG ambtenaar" : V[VOGAanvraag*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'Rijkspas';idmSoort~) -- met een Rijkspas ;idmDisplayName -- dan laten we de displayName zien @@ -566,7 +566,7 @@ BOX[ "2. VOG aanvraag (Organisatie template)" : I , "Datum" : orgOndertekeningDatum , "Handtekening" : ({-organisatieHandtekening-}(organisatieDigitaleHandtekening;idmDigitaleHandtekening~ /\ organisatiePasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening) ] - , "Ingelogde COVOG ambtenaar" : V[VOGAanvraagOrganisatieTemplate*SESSION];'_SESSION'; + , "Ingelogde COVOG ambtenaar" : V[VOGAanvraagOrganisatieTemplate*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'Rijkspas';idmSoort~) -- met een Rijkspas ;idmDisplayName -- dan laten we de displayName zien @@ -621,7 +621,7 @@ BOX[ "COVOG Zaaknummer" : gemVOGAanvraag;covogZaakNummer );idmDisplayHandtekening ) ] - , "Ingelogde COVOG ambtenaar" : V[GemeentelijkeVOGZaak*SESSION];'_SESSION'; + , "Ingelogde COVOG ambtenaar" : V[GemeentelijkeVOGZaak*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'Rijkspas';idmSoort~) -- met een Rijkspas ;idmDisplayName -- dan laten we de displayName zien diff --git a/VOGDemo/IFC-Gemeente.ifc b/VOGDemo/IFC-Gemeente.ifc index f1009098..6e4fd020 100644 --- a/VOGDemo/IFC-Gemeente.ifc +++ b/VOGDemo/IFC-Gemeente.ifc @@ -1,7 +1,7 @@ CONTEXT VOGAanvraagGemeentebalie IN DUTCH ----------------------------------------------------------- INTERFACE "Overzicht (Gemeente)" FOR Gemeente : I[ONE] -BOX[ "Gemeente ambtenaar" : V[ONE*SESSION];'_SESSION'; +BOX[ "Gemeente ambtenaar" : V[ONE*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'GemeenteID';idmSoort~) -- met een GemeenteID ;idmDisplayName -- dan laten we de displayName zien @@ -110,7 +110,7 @@ BOX[ "Aanvraagnummer" : gemeenteAanvraagnummer BOX[ "GemeenteID" : gemAmbtenaarUserid , "Wachtwoord" : gemAmbtenaarPassword ] - , "Ingelogde Gemeente ambtenaar" : V[GemeentelijkeVOGZaak*SESSION];'_SESSION'; + , "Ingelogde Gemeente ambtenaar" : V[GemeentelijkeVOGZaak*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'GemeenteID';idmSoort~) -- met een GemeenteID ;idmDisplayName -- dan laten we de displayName zien @@ -141,7 +141,7 @@ INTERFACE "VOG aanvraag invullen en ondertekenen" /\ gemeenteAanvraagnummer;gemeenteAanvraagnummer~ ) /\ {-userIsBehandelendGemeenteambtenaar-} - (I /\ V;'_SESSION'[SESSION];sessionUserid;gemAmbtenaarUserid~) + (I /\ V;"_SESSION"[SESSION];sessionUserid;gemAmbtenaarUserid~) /\ -{-sigGemeenteHeeftVolledigheidEnIdentiteitVastgesteld-}(I /\ gemOndertekeningDatum;gemOndertekeningDatum~ /\ ({-gemAmbtenaarHandtekening-}(gemAmbtenaarDigitaleHandtekening;idmDigitaleHandtekening~ /\ gemAmbtenaarPasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening);({-gemAmbtenaarHandtekening-}(gemAmbtenaarDigitaleHandtekening;idmDigitaleHandtekening~ /\ gemAmbtenaarPasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening)~) BOX[ "Aanvraagnummer" : gemeenteAanvraagnummer , "Behandelend ambtenaar" : (gemAmbtenaarUserid;idmUserid~ /\gemAmbtenaarPassword;idmPassword~);idmDisplayName @@ -221,7 +221,7 @@ BOX[ "Aanvraagnummer" : gemeenteAanvraagnummer , "Gemeente" : idmGemeente , "Plaats" : idmGemeentePlaats ] ] - , "Ingelogde Gemeente ambtenaar" : V[GemeentelijkeVOGZaak*SESSION];'_SESSION'; + , "Ingelogde Gemeente ambtenaar" : V[GemeentelijkeVOGZaak*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'GemeenteID';idmSoort~) -- met een GemeenteID ;idmDisplayName -- dan laten we de displayName zien @@ -235,7 +235,7 @@ BOX[ "Aanvraagnummer" : gemeenteAanvraagnummer ----------------------------------------------------------- INTERFACE "Opgestuurde VOG aanvragen" FOR Gemeente : I[GemeentelijkeVOGZaak] -;{-userIsBehandelendGemeenteambtenaar-}(I /\ V;'_SESSION'[SESSION];sessionUserid;gemAmbtenaarUserid~) +;{-userIsBehandelendGemeenteambtenaar-}(I /\ V;"_SESSION"[SESSION];sessionUserid;gemAmbtenaarUserid~) ;{-sigGemeenteHeeftVolledigheidEnIdentiteitVastgesteld-}(I /\ gemOndertekeningDatum;gemOndertekeningDatum~ /\ ({-gemAmbtenaarHandtekening-}(gemAmbtenaarDigitaleHandtekening;idmDigitaleHandtekening~ /\ gemAmbtenaarPasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening);({-gemAmbtenaarHandtekening-}(gemAmbtenaarDigitaleHandtekening;idmDigitaleHandtekening~ /\ gemAmbtenaarPasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening)~) BOX[ "Aanvraagnummer" : gemeenteAanvraagnummer , "Behandelend ambtenaar" : (gemAmbtenaarUserid;idmUserid~ /\gemAmbtenaarPassword;idmPassword~);idmDisplayName @@ -270,7 +270,7 @@ BOX[ "Aanvraagnummer" : gemeenteAanvraagnummer , "Gemeente" : idmGemeente , "Plaats" : idmGemeentePlaats ] ] - , "Ingelogde Gemeente ambtenaar" : V[GemeentelijkeVOGZaak*SESSION];'_SESSION'; + , "Ingelogde Gemeente ambtenaar" : V[GemeentelijkeVOGZaak*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'GemeenteID';idmSoort~) -- met een GemeenteID ;idmDisplayName -- dan laten we de displayName zien @@ -323,7 +323,7 @@ BOX[ "VOG aanvraag (Organisatie template)" : I[VOGAanvraagOrganisatieTemplate] , "Datum" : orgOndertekeningDatum , "Handtekening" : ({-organisatieHandtekening-}(organisatieDigitaleHandtekening;idmDigitaleHandtekening~ /\ organisatiePasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening) ] - , "Ingelogde Gemeente ambtenaar" : V[VOGAanvraagOrganisatieTemplate*SESSION];'_SESSION'; + , "Ingelogde Gemeente ambtenaar" : V[VOGAanvraagOrganisatieTemplate*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'GemeenteID';idmSoort~) -- met een GemeenteID ;idmDisplayName -- dan laten we de displayName zien diff --git a/VOGDemo/IFC-Organisatie.ifc b/VOGDemo/IFC-Organisatie.ifc index a182745f..5ece0045 100644 --- a/VOGDemo/IFC-Organisatie.ifc +++ b/VOGDemo/IFC-Organisatie.ifc @@ -1,7 +1,7 @@ CONTEXT VOGAanvragendeOrganisatie IN DUTCH ----------------------------------------------------------- INTERFACE "Overzicht (Organisaties)" FOR Organisatie : I[ONE] -BOX[ "Organisatiemedewerker" : V[ONE*SESSION];'_SESSION'; +BOX[ "Organisatiemedewerker" : V[ONE*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'EHvB';idmSoort~) -- met een EHvB ;idmDisplayName -- dan laten we de displayName zien @@ -12,7 +12,7 @@ BOX[ "Organisatiemedewerker" : V[ONE*SESSION];'_SESSION'; ;V;'EHvB'[Berichtje];loginMet -- dan zeggen we dat je met een EHvB moet inloggen ) - , "Organisatie" : V[ONE*SESSION];'_SESSION'; + , "Organisatie" : V[ONE*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'EHvB';idmSoort~) -- met een EHvB ;idmOrganisatie -- dan laten we de Organisatie zien @@ -31,7 +31,7 @@ BOX[ "Organisatiemedewerker" : V[ONE*SESSION];'_SESSION'; ( (organisatieUserid;idmUserid~ /\ organisatiePassword;idmPassword~) ;(I /\ idmSoort;'EHvB';idmSoort~) ) - ;idmUserid;sessionUserid~;'_SESSION';sessionUserid;idmUserid~; + ;idmUserid;sessionUserid~;"_SESSION";sessionUserid;idmUserid~; ( (organisatieUserid;idmUserid~ /\ organisatiePassword;idmPassword~) ;(I /\ idmSoort;'EHvB';idmSoort~) )~ @@ -50,7 +50,7 @@ BOX[ "Organisatiemedewerker" : V[ONE*SESSION];'_SESSION'; ) ;(idmUserid;sessionUserid~ /\ idmPassword;sessionPassword~) ) - ;'_SESSION'; + ;"_SESSION"; ({-userIsMedewerkerBijVOGTemplateOrganisatie-} ( (organisatieUserid;idmUserid~ /\ organisatiePassword;idmPassword~) ;(I /\ idmSoort;'EHvB';idmSoort~) @@ -70,7 +70,7 @@ BOX[ "Organisatiemedewerker" : V[ONE*SESSION];'_SESSION'; ) ) ;(idmUserid;sessionUserid~ /\ idmPassword;sessionPassword~) - ;'_SESSION' + ;"_SESSION" ;(idmUserid;sessionUserid~ /\ idmPassword;sessionPassword~)~ ;({-organisatieHandtekening-} ( organisatieDigitaleHandtekening;idmDigitaleHandtekening~ @@ -175,7 +175,7 @@ BOX[ "Kenmerk" : orgVOGTemplateID BOX[ "EHvB userid" : organisatieUserid , "Wachtwoord" : organisatiePassword ] - , "Ingelogde Organisatiemedewerker" : V[VOGAanvraagOrganisatieTemplate*SESSION];'_SESSION'; + , "Ingelogde Organisatiemedewerker" : V[VOGAanvraagOrganisatieTemplate*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'EHvB';idmSoort~) -- met een EHvB ;idmDisplayName -- dan laten we de displayName zien @@ -262,7 +262,7 @@ BOX[ "Invullen door organisatie / instelling die de VOG verlangt" : I , "Digitale handtekening" : organisatieDigitaleHandtekening , "Password handtekening" : organisatiePasswordHandtekening ] - , "Ingelogde Organisatiemedewerker" : V[VOGAanvraagOrganisatieTemplate*SESSION];'_SESSION'; + , "Ingelogde Organisatiemedewerker" : V[VOGAanvraagOrganisatieTemplate*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'EHvB';idmSoort~) -- met een EHvB ;idmDisplayName -- dan laten we de displayName zien @@ -321,7 +321,7 @@ BOX[ "VOG aanvraag (Organisatie template)" : I , "Datum" : orgOndertekeningDatum , "Handtekening" : ({-organisatieHandtekening-}(organisatieDigitaleHandtekening;idmDigitaleHandtekening~ /\ organisatiePasswordHandtekening;idmPasswordHandtekening~);idmDisplayHandtekening) ] - , "Ingelogde Organisatiemedewerker" : V[VOGAanvraagOrganisatieTemplate*SESSION];'_SESSION'; + , "Ingelogde Organisatiemedewerker" : V[VOGAanvraagOrganisatieTemplate*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'EHvB';idmSoort~) -- met een EHvB ;idmDisplayName -- dan laten we de displayName zien diff --git a/VOGDemo/Identificatiemiddelen.adl b/VOGDemo/Identificatiemiddelen.adl index e6aeac19..15d4d8d1 100644 --- a/VOGDemo/Identificatiemiddelen.adl +++ b/VOGDemo/Identificatiemiddelen.adl @@ -90,7 +90,7 @@ PATTERN SessionLogin CONCEPT SESSION "een communicatiekanaal tussen een applicatie en een gebruiker." PURPOSE CONCEPT SESSION IN DUTCH -{+Als meerdere gebruikers tegelijkertijd van eenzelfde applicatie gebruik willen maken, moet de communicatie die deze gebruikers (webclients) met de applicatie hebben, netjes uitelkaar worden gehouden. Daartoe gebruiken we de singleton '_SESSION', die door de prototype generator is geimplementeerd.+} +{+Als meerdere gebruikers tegelijkertijd van eenzelfde applicatie gebruik willen maken, moet de communicatie die deze gebruikers (webclients) met de applicatie hebben, netjes uitelkaar worden gehouden. Daartoe gebruiken we de singleton "_SESSION", die door de prototype generator is geimplementeerd.+} sessionUserid :: SESSION * Userid [UNI] PRAGMA "De gebruiker van " " is ingelogd onder " @@ -99,7 +99,7 @@ MEANING "Onder de 'sessionUserid' van een sessie verstaan we (de business identi sessionPassword :: SESSION * Password [UNI] PRAGMA "De gebruiker van " " heeft zich geauthenticeerd met behulp van " -RULE "Login": '_SESSION'[SESSION];sessionUserid;idmUserid~ |- '_SESSION';sessionPassword;idmPassword~ --Dit is een '|-' ipv '=' omdat een wachtwoord niet uniek hoeft te zijn +RULE "Login": "_SESSION"[SESSION];sessionUserid;idmUserid~ |- "_SESSION";sessionPassword;idmPassword~ --Dit is een '|-' ipv '=' omdat een wachtwoord niet uniek hoeft te zijn MEANING "Bij inloggen moet een geldige (Userid,Password) combinatie worden opgegeven." MESSAGE "Incorrect password" @@ -113,7 +113,7 @@ ENDPATTERN --[Interfaces voor alle users]------------------------------ -- INTERFACE die je moet gebruiken om nieuwe Sessions mee te maken: -INTERFACE Login (sessionUserid,sessionPassword): V[ONE*SESSION];'_SESSION'[SESSION] +INTERFACE Login (sessionUserid,sessionPassword): V[ONE*SESSION];"_SESSION"[SESSION] BOX [ userid : sessionUserid , password : sessionPassword ] diff --git a/VOGDemo/PortalenInloggen.adl b/VOGDemo/PortalenInloggen.adl index 712748af..3356173b 100644 --- a/VOGDemo/PortalenInloggen.adl +++ b/VOGDemo/PortalenInloggen.adl @@ -75,7 +75,7 @@ sessionPortal :: SESSION * PortaalFocus [UNI] sessionUserid :: SESSION * Userid [UNI] sessionPassword :: SESSION * Password [UNI] -RULE "Login": '_SESSION'[SESSION];(sessionPortal;portalAuthenticationMeans;idmSoort~ /\ sessionUserid;idmUserid~) |- '_SESSION';sessionPassword;idmPassword~ +RULE "Login": "_SESSION"[SESSION];(sessionPortal;portalAuthenticationMeans;idmSoort~ /\ sessionUserid;idmUserid~) |- "_SESSION";sessionPassword;idmPassword~ MEANING "Bij inloggen moet een geldige (Userid,Password) combinatie worden opgegeven." MESSAGE "Ongeldig wachtwoord" @@ -90,7 +90,7 @@ ENDPATTERN -- INTERFACE die je moet gebruiken om nieuwe Sessions mee te maken: INTERFACE OVERZICHT : I[ONE] -BOX[ "Mijn sessie": V[ONE*SESSION];'_SESSION'[SESSION] +BOX[ "Mijn sessie": V[ONE*SESSION];"_SESSION"[SESSION] , "Sessies" : V[ONE*SESSION] BOX[ "Sessie" : I[SESSION] , "Portaal" : sessionPortal @@ -111,7 +111,7 @@ BOX[ "Mijn sessie": V[ONE*SESSION];'_SESSION'[SESSION] ] ] -INTERFACE "EloVOG Portaal" (sessionPortal) FOR Organisatie, Betrokkene, Gemeente : V[ONE*SESSION];'_SESSION'[SESSION] +INTERFACE "EloVOG Portaal" (sessionPortal) FOR Organisatie, Betrokkene, Gemeente : V[ONE*SESSION];"_SESSION"[SESSION] BOX[ "Bent (of vertegenwoordigt) u (a) een organisatie, (b) een betrokkene (aanvrager) of (c) een gemeente?" : sessionPortal ] ----------------------------------------------------------- @@ -122,7 +122,7 @@ ROLE Organisatie, Betrokkene, Gemeente MAINTAINS "Role definitions" ENDPROCESS ----------------------------------------------------------- INTERFACE "EloVOG (Organisatie)" (sessionUserid,sessionPassword) FOR Organisatie: - V[ONE*SESSION];'_SESSION'[SESSION];(I[SESSION] /\ sessionPortal;'Organisatie';sessionPortal~) + V[ONE*SESSION];"_SESSION"[SESSION];(I[SESSION] /\ sessionPortal;'Organisatie';sessionPortal~) BOX[ "U moet inloggen d.m.v.: " : sessionPortal;portalAuthenticationMeans , "Gebruikersnaam" : sessionUserid , "Wachtwoord" : sessionPassword @@ -131,7 +131,7 @@ BOX[ "U moet inloggen d.m.v.: " : sessionPortal;portalAuthenticationMeans ] INTERFACE "EloVOG (Betrokkene)" (sessionUserid,sessionPassword) FOR Betrokkene: - V[ONE*SESSION];'_SESSION'[SESSION];(I[SESSION] /\ sessionPortal;'Betrokkene (aanvrager)';sessionPortal~) + V[ONE*SESSION];"_SESSION"[SESSION];(I[SESSION] /\ sessionPortal;'Betrokkene (aanvrager)';sessionPortal~) BOX[ "U moet inloggen d.m.v.: " : sessionPortal;portalAuthenticationMeans , "Gebruikersnaam" : sessionUserid , "Wachtwoord" : sessionPassword @@ -140,7 +140,7 @@ BOX[ "U moet inloggen d.m.v.: " : sessionPortal;portalAuthenticationMeans ] INTERFACE "EloVOG (Gemeente)" (sessionUserid,sessionPassword) FOR Gemeente: - V[ONE*SESSION];'_SESSION'[SESSION];(I[SESSION] /\ sessionPortal;'Gemeente';sessionPortal~) + V[ONE*SESSION];"_SESSION"[SESSION];(I[SESSION] /\ sessionPortal;'Gemeente';sessionPortal~) BOX[ "U moet inloggen d.m.v.: " : sessionPortal;portalAuthenticationMeans , "Gebruikersnaam" : sessionUserid , "Wachtwoord" : sessionPassword diff --git a/VOGDemo2/IFC-Aanvrager.ifc b/VOGDemo2/IFC-Aanvrager.ifc index 46ba1f4d..88c9d1ef 100644 --- a/VOGDemo2/IFC-Aanvrager.ifc +++ b/VOGDemo2/IFC-Aanvrager.ifc @@ -10,7 +10,7 @@ ROLE aanvrager MAINTAINS "Kleine aanvragers" ENDPROCESS ----------------------------------------------------------- INTERFACE "Mijn VOG Aanvragen" FOR Aanvrager, aanvrager : I[ONE] -- Dit is een zaakoverzicht -BOX[ "Welkom" : V[ONE*SESSION];'_SESSION'; +BOX[ "Welkom" : V[ONE*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'DigiD';idmSoort~) -- met een DigiD ;idmDisplayName -- dan laten we de displayName zien @@ -31,7 +31,7 @@ BOX[ "Welkom" : V[ONE*SESSION];'_SESSION'; /\ vogAanvragerIDVastgesteld;vogAanvragerIDVastgesteld~ );(vogAanvragerIDMSoort;idmSoort~ /\ vogAanvragerIDMNummer;idmNummer~) ) - ;idmUserid;sessionUserid~;'_SESSION';sessionUserid;idmUserid~; + ;idmUserid;sessionUserid~;"_SESSION";sessionUserid;idmUserid~; ( (vogAanvragerUserid;idmUserid~ /\ vogAanvragerPassword;idmPassword~);(I /\ idmSoort;'DigiD';idmSoort~) \/ aanvragerEmailAddress;idmEmailAddress~ \/ (I /\ gemVOGAanvraag~;gemAmbtenaarHandtekening;gemAmbtenaarHandtekening~;gemVOGAanvraag @@ -57,7 +57,7 @@ BOX[ "Welkom" : V[ONE*SESSION];'_SESSION'; (I /\ vogAfgifteBesluit;'Nee';vogAfgifteBesluit~ );vogAanvraagOrganisatieTemplate ] - , "Ingelogde Aanvrager" : V[ONE*SESSION];'_SESSION'; + , "Ingelogde Aanvrager" : V[ONE*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'DigiD';idmSoort~) -- met een DigiD ;idmDisplayName -- dan laten we de displayName zien @@ -71,7 +71,7 @@ BOX[ "Welkom" : V[ONE*SESSION];'_SESSION'; ----------------------------------------------------------- {- INTERFACE "Mijn Procesoverzicht" FOR Aanvrager, aanvrager : I[ONE] -- Dit is een procesoverzicht -BOX[ "Welkom" : V[ONE*SESSION];'_SESSION';((sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~);idmDisplayName \/ (I /\ -(sessionUserid;sessionUserid~));V;'DigiD'[Berichtje];loginMet) +BOX[ "Welkom" : V[ONE*SESSION];"_SESSION";((sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~);idmDisplayName \/ (I /\ -(sessionUserid;sessionUserid~));V;'DigiD'[Berichtje];loginMet) , "Invullen en ondertekenen" : V[ONE*VOGAanvraag]; (I /\ -(aanvragerHandtekening;aanvragerHandtekening~) @@ -83,7 +83,7 @@ BOX[ "Welkom" : V[ONE*SESSION];'_SESSION';((sessionUserid;idmUserid~ /\ sessionP /\ vogAanvragerIDVastgesteld;vogAanvragerIDVastgesteld~ );(vogAanvragerIDMSoort;idmSoort~ /\ vogAanvragerIDMNummer;idmNummer~) ) - ;idmUserid;sessionUserid~;'_SESSION';sessionUserid;idmUserid~; + ;idmUserid;sessionUserid~;"_SESSION";sessionUserid;idmUserid~; ( (vogAanvragerUserid;idmUserid~ /\ vogAanvragerPassword;idmPassword~);(I /\ idmSoort;'DigiD';idmSoort~) \/ aanvragerEmailAddress;idmEmailAddress~ \/ (I /\ gemVOGAanvraag~;gemAmbtenaarHandtekening;gemAmbtenaarHandtekening~;gemVOGAanvraag @@ -108,7 +108,7 @@ BOX[ "Welkom" : V[ONE*SESSION];'_SESSION';((sessionUserid;idmUserid~ /\ sessionP /\ vogAanvragerIDVastgesteld;vogAanvragerIDVastgesteld~ );(vogAanvragerIDMSoort;idmSoort~ /\ vogAanvragerIDMNummer;idmNummer~) ) - ;idmUserid;sessionUserid~;'_SESSION';sessionUserid;idmUserid~; + ;idmUserid;sessionUserid~;"_SESSION";sessionUserid;idmUserid~; ( (vogAanvragerUserid;idmUserid~ /\ vogAanvragerPassword;idmPassword~);(I /\ idmSoort;'DigiD';idmSoort~) \/ aanvragerEmailAddress;idmEmailAddress~ \/ (I /\ gemVOGAanvraag~;gemAmbtenaarHandtekening;gemAmbtenaarHandtekening~;gemVOGAanvraag @@ -128,7 +128,7 @@ BOX[ "Welkom" : V[ONE*SESSION];'_SESSION';((sessionUserid;idmUserid~ /\ sessionP /\ vogAanvragerIDVastgesteld;vogAanvragerIDVastgesteld~ );(vogAanvragerIDMSoort;idmSoort~ /\ vogAanvragerIDMNummer;idmNummer~) ) - ;idmUserid;sessionUserid~;'_SESSION';sessionUserid;idmUserid~; + ;idmUserid;sessionUserid~;"_SESSION";sessionUserid;idmUserid~; ( (vogAanvragerUserid;idmUserid~ /\ vogAanvragerPassword;idmPassword~);(I /\ idmSoort;'DigiD';idmSoort~) \/ aanvragerEmailAddress;idmEmailAddress~ \/ (I /\ gemVOGAanvraag~;gemAmbtenaarHandtekening;gemAmbtenaarHandtekening~;gemVOGAanvraag @@ -148,7 +148,7 @@ BOX[ "Welkom" : V[ONE*SESSION];'_SESSION';((sessionUserid;idmUserid~ /\ sessionP /\ vogAanvragerIDVastgesteld;vogAanvragerIDVastgesteld~ );(vogAanvragerIDMSoort;idmSoort~ /\ vogAanvragerIDMNummer;idmNummer~) ) - ;idmUserid;sessionUserid~;'_SESSION';sessionUserid;idmUserid~; + ;idmUserid;sessionUserid~;"_SESSION";sessionUserid;idmUserid~; ( (vogAanvragerUserid;idmUserid~ /\ vogAanvragerPassword;idmPassword~);(I /\ idmSoort;'DigiD';idmSoort~) \/ aanvragerEmailAddress;idmEmailAddress~ \/ (I /\ gemVOGAanvraag~;gemAmbtenaarHandtekening;gemAmbtenaarHandtekening~;gemVOGAanvraag @@ -253,7 +253,7 @@ BOX[ "1. Invullen door Aanvrager" : I ] ] , "2. Invullen door organisatie / instelling die de VOG verlangt": vogAanvraagOrganisatieTemplate , "3. Heeft u de leges betaald?" : zijnDeLegesBetaald - , "Ingelogde Aanvrager" : V[VOGAanvraag*SESSION];'_SESSION'; + , "Ingelogde Aanvrager" : V[VOGAanvraag*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'DigiD';idmSoort~) -- met een DigiD ;idmDisplayName -- dan laten we de displayName zien @@ -279,7 +279,7 @@ INTERFACE "In behandeling" /\ vogAanvragerIDVastgesteld;vogAanvragerIDVastgesteld~ );(vogAanvragerIDMSoort;idmSoort~ /\ vogAanvragerIDMNummer;idmNummer~) ) - ;idmUserid;sessionUserid~;'_SESSION';sessionUserid;idmUserid~; + ;idmUserid;sessionUserid~;"_SESSION";sessionUserid;idmUserid~; ( (vogAanvragerUserid;idmUserid~ /\ vogAanvragerPassword;idmPassword~);(I /\ idmSoort;'DigiD';idmSoort~) \/ aanvragerEmailAddress;idmEmailAddress~ \/ (I /\ gemVOGAanvraag~;gemAmbtenaarHandtekening;gemAmbtenaarHandtekening~;gemVOGAanvraag @@ -334,7 +334,7 @@ BOX[ "Contactgegevens": I , "Datum" : orgOndertekeningDatum , "Handtekening" : organisatieHandtekening ] ] - , "Ingelogde Aanvrager" : V[VOGAanvraag*SESSION];'_SESSION'; + , "Ingelogde Aanvrager" : V[VOGAanvraag*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'DigiD';idmSoort~) -- met een DigiD ;idmDisplayName -- dan laten we de displayName zien diff --git a/VOGDemo2/IFC-COVOG.ifc b/VOGDemo2/IFC-COVOG.ifc index c1e39879..8e47c4c0 100644 --- a/VOGDemo2/IFC-COVOG.ifc +++ b/VOGDemo2/IFC-COVOG.ifc @@ -6,7 +6,7 @@ Het proces loopt grofweg als volgt. Nadat is vastgesteld dat er een vergoeding ( -} ------------------------------------------------------------ INTERFACE "Overzicht (COVOG)" FOR COVOG : I[ONE] -BOX[ "COVOG medewerker" : V[ONE*SESSION];'_SESSION'; +BOX[ "COVOG medewerker" : V[ONE*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'Rijkspas';idmSoort~) -- met een Rijkspas ;idmDisplayName -- dan laten we de displayName zien @@ -75,7 +75,7 @@ BOX[ "COVOG zaaknummer" : covogZaakNummer , "Aanvrager" : ((vogAanvragerUserid;idmUserid~ /\ vogAanvragerPassword;idmPassword~) \/ (vogAanvragerIDMSoort;idmSoort~ /\ vogAanvragerIDMNummer;idmNummer~));idmDisplayName , "Leges zijn betaald door aanvrager" : zijnDeLegesBetaald , "Leges zijn betaald via de gemeente" : gemVOGAanvraag~;gemLegesBetaald - , "Ingelogde COVOG ambtenaar" : V[VOGAanvraag*SESSION];'_SESSION'; + , "Ingelogde COVOG ambtenaar" : V[VOGAanvraag*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'Rijkspas';idmSoort~) -- met een Rijkspas ;idmDisplayName -- dan laten we de displayName zien @@ -164,7 +164,7 @@ BOX[ "COVOG zaaknummer" : covogZaakNummer , "Is, gezien het voorafgaande, de aanvraag ontvankelijk?" : isAanvraagOntvankelijk , "Motivatie (indien wordt afgeweken van het beleid)" : covogOntvankelijkheidMotivatie - , "Ingelogde COVOG ambtenaar" : V[VOGAanvraag*SESSION];'_SESSION'; + , "Ingelogde COVOG ambtenaar" : V[VOGAanvraag*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'Rijkspas';idmSoort~) -- met een Rijkspas ;idmDisplayName -- dan laten we de displayName zien @@ -386,7 +386,7 @@ BOX[ "VOG Zaaknummer" : covogZaakNummer -} ) , "Wordt de VOG afgegeven?" : vogAfgifteBesluit - , "Ingelogde COVOG ambtenaar" : V[VOGAanvraag*SESSION];'_SESSION'; + , "Ingelogde COVOG ambtenaar" : V[VOGAanvraag*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'Rijkspas';idmSoort~) -- met een Rijkspas ;idmDisplayName -- dan laten we de displayName zien @@ -503,7 +503,7 @@ BOX[ "VOG Zaaknummer" : covogZaakNummer , "Datum" : aanvragerOndertekeningDatum , "Handtekening" : aanvragerHandtekening ] ] - , "Ingelogde COVOG ambtenaar" : V[VOGAanvraag*SESSION];'_SESSION'; + , "Ingelogde COVOG ambtenaar" : V[VOGAanvraag*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'Rijkspas';idmSoort~) -- met een Rijkspas ;idmDisplayName -- dan laten we de displayName zien @@ -557,7 +557,7 @@ BOX[ "2. VOG aanvraag (Organisatie template)" : I , "Datum" : orgOndertekeningDatum , "Handtekening" : organisatieHandtekening ] - , "Ingelogde COVOG ambtenaar" : V[VOGAanvraagOrganisatieTemplate*SESSION];'_SESSION'; + , "Ingelogde COVOG ambtenaar" : V[VOGAanvraagOrganisatieTemplate*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'Rijkspas';idmSoort~) -- met een Rijkspas ;idmDisplayName -- dan laten we de displayName zien @@ -611,7 +611,7 @@ BOX[ "COVOG Zaaknummer" : gemVOGAanvraag;covogZaakNummer );idmDisplayHandtekening ) ] - , "Ingelogde COVOG ambtenaar" : V[GemeentelijkeVOGZaak*SESSION];'_SESSION'; + , "Ingelogde COVOG ambtenaar" : V[GemeentelijkeVOGZaak*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'Rijkspas';idmSoort~) -- met een Rijkspas ;idmDisplayName -- dan laten we de displayName zien diff --git a/VOGDemo2/IFC-Gemeente.ifc b/VOGDemo2/IFC-Gemeente.ifc index 9e888f38..8ea46296 100644 --- a/VOGDemo2/IFC-Gemeente.ifc +++ b/VOGDemo2/IFC-Gemeente.ifc @@ -1,7 +1,7 @@ CONTEXT VOGAanvraagGemeentebalie IN DUTCH ----------------------------------------------------------- INTERFACE "Overzicht (Gemeente)" FOR Gemeente : I[ONE] -BOX[ "Gemeente ambtenaar" : V[ONE*SESSION];'_SESSION'; +BOX[ "Gemeente ambtenaar" : V[ONE*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'GemeenteID';idmSoort~) -- met een GemeenteID ;idmDisplayName -- dan laten we de displayName zien @@ -71,7 +71,7 @@ BOX[ "Aanvraagnummer" : gemeenteAanvraagnummer BOX[ "GemeenteID" : gemAmbtenaarUserid , "Wachtwoord" : gemAmbtenaarPassword ] - , "Ingelogde Gemeente ambtenaar" : V[GemeentelijkeVOGZaak*SESSION];'_SESSION'; + , "Ingelogde Gemeente ambtenaar" : V[GemeentelijkeVOGZaak*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'GemeenteID';idmSoort~) -- met een GemeenteID ;idmDisplayName -- dan laten we de displayName zien @@ -102,7 +102,7 @@ INTERFACE "VOG aanvraag invullen en ondertekenen" /\ gemeenteAanvraagnummer;gemeenteAanvraagnummer~ ) /\ {-userIsBehandelendGemeenteambtenaar-} - (I /\ V;'_SESSION'[SESSION];sessionUserid;gemAmbtenaarUserid~) + (I /\ V;"_SESSION"[SESSION];sessionUserid;gemAmbtenaarUserid~) /\ -sigGemeenteHeeftVolledigheidEnIdentiteitVastgesteld BOX[ "Aanvraagnummer" : gemeenteAanvraagnummer , "Behandelend ambtenaar" : (gemAmbtenaarUserid;idmUserid~ /\gemAmbtenaarPassword;idmPassword~);idmDisplayName @@ -181,7 +181,7 @@ BOX[ "Aanvraagnummer" : gemeenteAanvraagnummer , "Gemeente" : idmGemeente , "Plaats" : idmGemeentePlaats ] ] - , "Ingelogde Gemeente ambtenaar" : V[GemeentelijkeVOGZaak*SESSION];'_SESSION'; + , "Ingelogde Gemeente ambtenaar" : V[GemeentelijkeVOGZaak*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'GemeenteID';idmSoort~) -- met een GemeenteID ;idmDisplayName -- dan laten we de displayName zien @@ -195,7 +195,7 @@ BOX[ "Aanvraagnummer" : gemeenteAanvraagnummer ----------------------------------------------------------- INTERFACE "Opgestuurde VOG aanvragen" FOR Gemeente : I[GemeentelijkeVOGZaak] -;{-userIsBehandelendGemeenteambtenaar-}(I /\ V;'_SESSION'[SESSION];sessionUserid;gemAmbtenaarUserid~) +;{-userIsBehandelendGemeenteambtenaar-}(I /\ V;"_SESSION"[SESSION];sessionUserid;gemAmbtenaarUserid~) ;sigGemeenteHeeftVolledigheidEnIdentiteitVastgesteld BOX[ "Aanvraagnummer" : gemeenteAanvraagnummer , "Behandelend ambtenaar" : (gemAmbtenaarUserid;idmUserid~ /\gemAmbtenaarPassword;idmPassword~);idmDisplayName @@ -229,7 +229,7 @@ BOX[ "Aanvraagnummer" : gemeenteAanvraagnummer , "Gemeente" : idmGemeente , "Plaats" : idmGemeentePlaats ] ] - , "Ingelogde Gemeente ambtenaar" : V[GemeentelijkeVOGZaak*SESSION];'_SESSION'; + , "Ingelogde Gemeente ambtenaar" : V[GemeentelijkeVOGZaak*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'GemeenteID';idmSoort~) -- met een GemeenteID ;idmDisplayName -- dan laten we de displayName zien @@ -282,7 +282,7 @@ BOX[ "VOG aanvraag (Organisatie template)" : I[VOGAanvraagOrganisatieTemplate] , "Datum" : orgOndertekeningDatum , "Handtekening" : organisatieHandtekening ] - , "Ingelogde Gemeente ambtenaar" : V[VOGAanvraagOrganisatieTemplate*SESSION];'_SESSION'; + , "Ingelogde Gemeente ambtenaar" : V[VOGAanvraagOrganisatieTemplate*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'GemeenteID';idmSoort~) -- met een GemeenteID ;idmDisplayName -- dan laten we de displayName zien diff --git a/VOGDemo2/IFC-Organisatie.ifc b/VOGDemo2/IFC-Organisatie.ifc index dc095987..9581d26f 100644 --- a/VOGDemo2/IFC-Organisatie.ifc +++ b/VOGDemo2/IFC-Organisatie.ifc @@ -1,7 +1,7 @@ CONTEXT VOGAanvragendeOrganisatie IN DUTCH ----------------------------------------------------------- INTERFACE "Overzicht (Organisaties)" FOR Organisatie : I[ONE] -BOX[ "Organisatiemedewerker" : V[ONE*SESSION];'_SESSION'; +BOX[ "Organisatiemedewerker" : V[ONE*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'EHvB';idmSoort~) -- met een EHvB ;idmDisplayName -- dan laten we de displayName zien @@ -12,7 +12,7 @@ BOX[ "Organisatiemedewerker" : V[ONE*SESSION];'_SESSION'; ;V;'EHvB'[Berichtje];loginMet -- dan zeggen we dat je met een EHvB moet inloggen ) - , "Organisatie" : V[ONE*SESSION];'_SESSION'; + , "Organisatie" : V[ONE*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'EHvB';idmSoort~) -- met een EHvB ;idmOrganisatie -- dan laten we de Organisatie zien @@ -31,7 +31,7 @@ BOX[ "Organisatiemedewerker" : V[ONE*SESSION];'_SESSION'; ( (organisatieUserid;idmUserid~ /\ organisatiePassword;idmPassword~) ;(I /\ idmSoort;'EHvB';idmSoort~) ) - ;idmUserid;sessionUserid~;'_SESSION';sessionUserid;idmUserid~; + ;idmUserid;sessionUserid~;"_SESSION";sessionUserid;idmUserid~; ( (organisatieUserid;idmUserid~ /\ organisatiePassword;idmPassword~) ;(I /\ idmSoort;'EHvB';idmSoort~) )~ @@ -50,7 +50,7 @@ BOX[ "Organisatiemedewerker" : V[ONE*SESSION];'_SESSION'; ) ;(idmUserid;sessionUserid~ /\ idmPassword;sessionPassword~) ) - ;'_SESSION'; + ;"_SESSION"; ({-userIsMedewerkerBijVOGTemplateOrganisatie-} ( (organisatieUserid;idmUserid~ /\ organisatiePassword;idmPassword~) ;(I /\ idmSoort;'EHvB';idmSoort~) @@ -68,7 +68,7 @@ BOX[ "Organisatiemedewerker" : V[ONE*SESSION];'_SESSION'; /\ organisatiePasswordHandtekening;idmPasswordHandtekening~ ) ;(idmUserid;sessionUserid~ /\ idmPassword;sessionPassword~) - ;'_SESSION' + ;"_SESSION" ;(idmUserid;sessionUserid~ /\ idmPassword;sessionPassword~)~ ;( organisatieDigitaleHandtekening;idmDigitaleHandtekening~ /\ organisatiePasswordHandtekening;idmPasswordHandtekening~ @@ -144,7 +144,7 @@ BOX[ "Kenmerk" : orgVOGTemplateID BOX[ "EHvB userid" : organisatieUserid , "Wachtwoord" : organisatiePassword ] - , "Ingelogde Organisatiemedewerker" : V[VOGAanvraagOrganisatieTemplate*SESSION];'_SESSION'; + , "Ingelogde Organisatiemedewerker" : V[VOGAanvraagOrganisatieTemplate*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'EHvB';idmSoort~) -- met een EHvB ;idmDisplayName -- dan laten we de displayName zien @@ -226,7 +226,7 @@ BOX[ "Invullen door organisatie / instelling die de VOG verlangt" : I , "Digitale handtekening" : organisatieDigitaleHandtekening , "Password handtekening" : organisatiePasswordHandtekening ] - , "Ingelogde Organisatiemedewerker" : V[VOGAanvraagOrganisatieTemplate*SESSION];'_SESSION'; + , "Ingelogde Organisatiemedewerker" : V[VOGAanvraagOrganisatieTemplate*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'EHvB';idmSoort~) -- met een EHvB ;idmDisplayName -- dan laten we de displayName zien @@ -285,7 +285,7 @@ BOX[ "VOG aanvraag (Organisatie template)" : I , "Datum" : orgOndertekeningDatum , "Handtekening" : organisatieHandtekening ] - , "Ingelogde Organisatiemedewerker" : V[VOGAanvraagOrganisatieTemplate*SESSION];'_SESSION'; + , "Ingelogde Organisatiemedewerker" : V[VOGAanvraagOrganisatieTemplate*SESSION];"_SESSION"; ( (sessionUserid;idmUserid~ /\ sessionPassword;idmPassword~) -- als er is ingelogd ;(I /\ idmSoort;'EHvB';idmSoort~) -- met een EHvB ;idmDisplayName -- dan laten we de displayName zien diff --git a/VOGDemo2/Identificatiemiddelen.adl b/VOGDemo2/Identificatiemiddelen.adl index a52de123..17f9cab3 100644 --- a/VOGDemo2/Identificatiemiddelen.adl +++ b/VOGDemo2/Identificatiemiddelen.adl @@ -90,7 +90,7 @@ PATTERN SessionLogin CONCEPT SESSION "een communicatiekanaal tussen een applicatie en een gebruiker." PURPOSE CONCEPT SESSION IN DUTCH -{+Als meerdere gebruikers tegelijkertijd van eenzelfde applicatie gebruik willen maken, moet de communicatie die deze gebruikers (webclients) met de applicatie hebben, netjes uitelkaar worden gehouden. Daartoe gebruiken we de singleton '_SESSION', die door de prototype generator is geimplementeerd.+} +{+Als meerdere gebruikers tegelijkertijd van eenzelfde applicatie gebruik willen maken, moet de communicatie die deze gebruikers (webclients) met de applicatie hebben, netjes uitelkaar worden gehouden. Daartoe gebruiken we de singleton "_SESSION", die door de prototype generator is geimplementeerd.+} sessionUserid :: SESSION * Userid [UNI] PRAGMA "De gebruiker van " " is ingelogd onder " @@ -99,7 +99,7 @@ MEANING "Onder de 'sessionUserid' van een sessie verstaan we (de business identi sessionPassword :: SESSION * Password [UNI] PRAGMA "De gebruiker van " " heeft zich geauthenticeerd met behulp van " -RULE "Login": '_SESSION'[SESSION];sessionUserid;idmUserid~ |- '_SESSION';sessionPassword;idmPassword~ --Dit is een '|-' ipv '=' omdat een wachtwoord niet uniek hoeft te zijn +RULE "Login": "_SESSION"[SESSION];sessionUserid;idmUserid~ |- "_SESSION";sessionPassword;idmPassword~ --Dit is een '|-' ipv '=' omdat een wachtwoord niet uniek hoeft te zijn MEANING "Bij inloggen moet een geldige (Userid,Password) combinatie worden opgegeven." MESSAGE "Incorrect password" @@ -113,7 +113,7 @@ ENDPATTERN --[Interfaces voor alle users]------------------------------ -- INTERFACE die je moet gebruiken om nieuwe Sessions mee te maken: -INTERFACE Login (sessionUserid,sessionPassword): V[ONE*SESSION];'_SESSION'[SESSION] +INTERFACE Login (sessionUserid,sessionPassword): V[ONE*SESSION];"_SESSION"[SESSION] BOX [ userid : sessionUserid , password : sessionPassword ] diff --git a/WODC/OnderzoekWODC.adl b/WODC/OnderzoekWODC.adl index d3517a56..c33ee3d4 100644 --- a/WODC/OnderzoekWODC.adl +++ b/WODC/OnderzoekWODC.adl @@ -46,12 +46,12 @@ REPRESENT Uitspraak TYPE BIGALPHANUMERIC RELATION sessie[Reactie*SESSIE] ROLE ExecEngine MAINTAINS "sessiekoppeling" RULE "sessiekoppeling" : I[Reactie] |- sessie;sessie~ -VIOLATION (TXT "{EX} InsPair;sessie;Reactie;", SRC I, TXT ";SESSION;", SRC '_SESSION') +VIOLATION (TXT "{EX} InsPair;sessie;Reactie;", SRC I, TXT ";SESSION;", SRC "_SESSION") ENDPATTERN VIEW Stelling : Stelling(formulering) -INTERFACE "Stellingen" FOR Expert : '_SESSION';V[SESSION*Stelling] cRud BOX +INTERFACE "Stellingen" FOR Expert : "_SESSION";V[SESSION*Stelling] cRud BOX [ "Klik op een onderstaande stelling om uitspraken erover te zien en te reageren" : I cRud , thema : reactieOp~;relevant~;onderwerp cRUd ] diff --git a/ZwolleFrontEnd/CP23/CP23 Interfaces.adl b/ZwolleFrontEnd/CP23/CP23 Interfaces.adl index 1476a75c..8b9d622e 100644 --- a/ZwolleFrontEnd/CP23/CP23 Interfaces.adl +++ b/ZwolleFrontEnd/CP23/CP23 Interfaces.adl @@ -4,7 +4,7 @@ sessionEmployee :: SESSION * Employee [UNI] sessionOrgRole :: SESSION * OrganizationalRole [UNI] sessionEqtType :: SESSION * EquipmentType [UNI] -INTERFACE OVERVIEW (sessionEmployee, sessionOrgRole) : '_SESSION'[SESSION] +INTERFACE OVERVIEW (sessionEmployee, sessionOrgRole) : "_SESSION"[SESSION] TABS[ "Current session" : I ROWS[ "Employee" : sessionEmployee , "Org. Roles" : sessionOrgRole @@ -17,7 +17,7 @@ TABS[ "Current session" : I , "Personal Equipment": V[SESSION*Equipment];(I /\ emplOwnsEqt~;emplOwnsEqt) ] -INTERFACE Select (sessionEmployee, sessionOrgRole, sessionEqtType) : '_SESSION'[SESSION] +INTERFACE Select (sessionEmployee, sessionOrgRole, sessionEqtType) : "_SESSION"[SESSION] BOX[ "Employee" : sessionEmployee , "Org.Role" : sessionOrgRole , "Eqt.Type" : sessionEqtType @@ -25,7 +25,7 @@ BOX[ "Employee" : sessionEmployee --[EquipmentIssuer]-- -- Equipment Issuers may issue company equipment to employees, and should make sure that equipment is properly returned -INTERFACE "EqtIssuer: Overview" (sessionEmployee, sessionEqtType) FOR HRMOfficer : '_SESSION'[SESSION] +INTERFACE "EqtIssuer: Overview" (sessionEmployee, sessionEqtType) FOR HRMOfficer : "_SESSION"[SESSION] BOX[ "Employees" : V[SESSION*Employee] BOX[ "ID" : I , "Status":emplStatus ] , "Eqt.Types" : V[SESSION*EqtType] -- BOX[ "ID" : I , "Status":eqtTypeStatus ] , "Select" : I INTERFACE Select @@ -73,7 +73,7 @@ INTERFACE "EqtIssuer: Equipment" (eqtKind, eqtMake, eqtType, eqtSerial, eqtStatu -- HRM Officers may add/remove employees, organizational roles, and assign such roles to employees. -- An extension might be to introduce organizational units (departments) if this makes life easier... -INTERFACE "HRM: Overview" (sessionEmployee, sessionOrgRole) FOR HRMOfficer : '_SESSION'[SESSION] +INTERFACE "HRM: Overview" (sessionEmployee, sessionOrgRole) FOR HRMOfficer : "_SESSION"[SESSION] BOX[ "Org. Roles" : V[SESSION*OrganizationalRole] , "Employees" : V[SESSION*Employee] BOX[ "ID" : I , "Status":emplStatus ] , "Select" : I INTERFACE Select @@ -101,7 +101,7 @@ BOX[ "Org. Role" : I --[Employees]-- -- Employees may add/remove devices they own, and modify the status of any equipment issued to, or owned by them. -INTERFACE "Empl: Overview" (sessionEmployee, emplOwnsEqt, eqtKind, eqtMake, eqtType, eqtSerial, eqtStatus) FOR Employee : '_SESSION'[SESSION] +INTERFACE "Empl: Overview" (sessionEmployee, emplOwnsEqt, eqtKind, eqtMake, eqtType, eqtSerial, eqtStatus) FOR Employee : "_SESSION"[SESSION] BOX[ "Select" : I INTERFACE Select , "Employee" : sessionEmployee BOX[ "Name" : emplName diff --git a/ZwolleFrontEnd/DaggerExample.adl b/ZwolleFrontEnd/DaggerExample.adl index 8b8d28c9..5f7a4fe4 100644 --- a/ZwolleFrontEnd/DaggerExample.adl +++ b/ZwolleFrontEnd/DaggerExample.adl @@ -37,7 +37,7 @@ POPULATION orderOK CONTAINS [ ("Order2", "Order2") ] POPULATION orderOK CONTAINS [ ("Order3", "Order3") ] -INTERFACE Orders (lineInOrder, lineText, orderOK): '_SESSION'[SESSION];V[SESSION*Order] +INTERFACE Orders (lineInOrder, lineText, orderOK): "_SESSION"[SESSION];V[SESSION*Order] COLS[ Order : I , orderOK : orderOK;V;'OK'[Msg] \/ (I /\ -orderOK);V;'Not OK'[Msg] , lines : lineInOrder~ diff --git a/ZwolleFrontEnd/Fire/FireFighting.ifc b/ZwolleFrontEnd/Fire/FireFighting.ifc index 8cd9eac5..574b44ba 100644 --- a/ZwolleFrontEnd/Fire/FireFighting.ifc +++ b/ZwolleFrontEnd/Fire/FireFighting.ifc @@ -1,6 +1,6 @@ CONTEXT "Fire Fighting Interfaces" IN ENGLISH -INTERFACE "OVERVIEW" (fdetDetectsFire) : '_SESSION'[SESSION] +INTERFACE "OVERVIEW" (fdetDetectsFire) : "_SESSION"[SESSION] TABS[ "Fire detectors" : V[SESSION*FireDetector] COLS[ "Fdet ID" : fdetID , "FireDetected?" : fdetDetectsFire -- do the default thing diff --git a/ZwolleFrontEnd/RWS/RWS.adl b/ZwolleFrontEnd/RWS/RWS.adl index d15052b2..a3364f47 100644 --- a/ZwolleFrontEnd/RWS/RWS.adl +++ b/ZwolleFrontEnd/RWS/RWS.adl @@ -57,13 +57,13 @@ MEANING "Elke installatie kan van hoogstens 1 soort zijn" VIOLATION (TXT "Voor installatie ", SRC I, TXT " zijn meerdere installatiesoorten gespecificeerd, waaronder ", TGT I) --[Interfaces]-- -INTERFACE "Overzicht" : '_SESSION'[SESSION] cRud +INTERFACE "Overzicht" : "_SESSION"[SESSION] cRud TABS[ "Kabels" : V[SESSION*Kabel] cRud INTERFACE "[Kabels]" , "Installaties" : V[SESSION*Installatie] cRud INTERFACE "[Installaties]" , "Aansluitpunten" : V[SESSION*Aansluitpunt] cRud ] -INTERFACE "Issues" : '_SESSION'[SESSION] cRud +INTERFACE "Issues" : "_SESSION"[SESSION] cRud TABS[ "Kabel issues" : V[SESSION*Kabel]; ( (I /\ vanInst;-I;vanInst~) -- meerdere beginpunten \/ (I /\ naarInst;-I;naarInst~) -- meerdere eindpunten