Skip to content

Commit

Permalink
Replaced quotes of singleton expressions in a lot of places.
Browse files Browse the repository at this point in the history
  • Loading branch information
hanjoosten committed Nov 10, 2017
1 parent 10067bf commit dbdffc2
Show file tree
Hide file tree
Showing 97 changed files with 390 additions and 390 deletions.
2 changes: 1 addition & 1 deletion Braga/Braga.adl
Original file line number Diff line number Diff line change
Expand Up @@ -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<SCOLS>
[ relation : I
Expand Down
10 changes: 5 additions & 5 deletions CP23/CP23 Interfaces.oldadl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Contract Management/Cases.adl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Contract Management/CvM.adl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
-->
<div ng-repeat="atom in resource['$name$']">
Expand Down
4 changes: 2 additions & 2 deletions Delivery/Delivery.adl
Original file line number Diff line number Diff line change
@@ -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]
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Delivery/DeliveryAccounts.adl
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
2 changes: 1 addition & 1 deletion Doosjes/Counters.adl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions Doosjes/Developer.ifc
Original file line number Diff line number Diff line change
Expand Up @@ -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 <SCOLS>[ "ID" : I <ScopeInScope>
, "Part of" : scopeIPO <ScopeInScope>
, "Copy of" : scopeICO <ScopeInScope>
Expand Down Expand Up @@ -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 <SCOLS>[ "Name" : constName
, "Part of" : constScope <ScopeInScope>
, "Copy of" : constICO
Expand All @@ -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 <SCOLS>[ "ID" : I
, "Part of (scope)" : wScope <ScopeInScope>
-- , "Source (portRef)" : I <WireSrcPortRef>
Expand All @@ -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 <SCOLS>[ "ID" : I
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions Doosjes/ScopeEditingSvc.adl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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"
Expand All @@ -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
Expand Down
20 changes: 10 additions & 10 deletions EURent/EURent Customer.ifc
Original file line number Diff line number Diff line change
Expand Up @@ -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 <ROWSNL>
INTERFACE "Customer Car Rentals" : "_SESSION"[SESSION] cRud BOX <ROWSNL>
[ "Anonymous sessions" : (I-(sessionAccount;sessionAccount~)) cRud BOX <ROWSNL>
[ "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"
Expand All @@ -52,7 +52,7 @@ INTERFACE "Customer Car Rentals" : '_SESSION'[SESSION] cRud BOX <ROWSNL>
, "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"
]
Expand All @@ -76,7 +76,7 @@ INTERFACE "Customer Car Rentals" : '_SESSION'[SESSION] cRud BOX <ROWSNL>
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 <ROWSNL> -- If we have an unpromised current rental case
INTERFACE "Edit unpromised car rental" : "_SESSION" /\ sessionStartRC;(I-rentalHasBeenPromised);sessionStartRC~ cRud BOX <ROWSNL> -- 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"
Expand All @@ -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 <ROWSNL>
[ "Login": '_SESSION'-(sessionAccount;sessionAccount~) cRud BOX <ROWSNL>
INTERFACE "Login/Register": "_SESSION"[SESSION] cRud BOX <ROWSNL>
[ "Login": "_SESSION"-(sessionAccount;sessionAccount~) cRud BOX <ROWSNL>
[ "Login": I cRud BOX <HCOLS>
[ "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 <COLSNL>
, "Request LoginAssist" {- FOR Developer -}: "_SESSION"-sessionLoginAssist cRud BOX <COLSNL>
[ "Show accounts to login with": I BOX <PropertyButton> [ property : sessionLoginAssist cRUd ]
, " ": sessionLoginAssist;(V-(V;I[Customer];V));'Cannot help - there are no Customer-accounts'[LoginMessage] cRud
]
Expand All @@ -112,13 +112,13 @@ INTERFACE "Login/Register": '_SESSION'[SESSION] cRud BOX <ROWSNL>
]
]
--$End of login support for demonstrations and/or development
, "Registration": ('_SESSION'-(sessionAccount;sessionAccount~))-sessionLoginAssist cRud BOX <ROWSNL>
, "Registration": ("_SESSION"-(sessionAccount;sessionAccount~))-sessionLoginAssist cRud BOX <ROWSNL>
[ "Register": I cRud BOX <HCOLS>
[ "Userid" : loginUserid cRUd
, "Password" : registerPassword crUd -- crUd is needed for Passwords
, "Your (full) name" : sessionPersonRef cRUd
, "Register" : I BOX <PropertyButton>
[ 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.
Expand All @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion EURent/EURent Developer.ifc
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading

0 comments on commit dbdffc2

Please sign in to comment.