src/flat-users/unreleased.yaml

@@ -117,7 +117,7 @@ enums:
       lenovolinux_used_quertz:
         description: Lenovo laptop running Linux with German keyboard layout, max five years old.
       other:
-        description: Non-standard equipment, specify in comments.
+        description: Non-standard equipment, specify in the description.
 
   RequestableAccessory:
     description: Requestable accessories for INM-7 users
@@ -127,9 +127,9 @@ enums:
       headset_std:
         description: Headset USB/wireless/3.5mm (Corsair Virtuoso RGB wireless black).
       headset_custom:
-        description: Other headset (max 200 Euro incl Tax), specify in comments.
+        description: Other headset (max 200 Euro incl Tax), specify in the description.
       other:
-        description: Other kind of accessory, specify in comments.
+        description: Other kind of accessory, specify in the description.
 
 slots:
   allocated_software_licenses:
@@ -162,7 +162,7 @@ slots:
       The standard workplace package is a Dell 27-inch screen
       with built-in USB-C dock, a keyboard, and a mouse. The standard
       headset is a USB/wireless/3.5mm Corsair Virtuoso RGB wireless black.
-      For other accessories, choose "other" and specify in the comments.
+      For other accessories, choose "other" and specify in the description.
     range: RequestableAccessory
     multivalued: true
 
@@ -173,9 +173,9 @@ slots:
     # guestimated from looking at juseless /home
     pattern: '[a-z]+[a-z1-9.]+'
 
-  requested_juseless_group_membership:
+  juseless_group_membership:
     title: Juseless group membership
-    description: Groups on the Juseless system this user should become member of.
+    description: Groups on the Juseless system this user needs be a member of.
     range: JuselessGroup
     multivalued: true
 
@@ -189,9 +189,9 @@ slots:
     range: RequestableLaptop
 
   user_classifications:
-    title: Organization type
+    title: User type(s)
     description: >-
-      Type of an organization.
+      Type classifications for users
     range: UserClassification
     multivalued: true
 
@@ -230,12 +230,79 @@ classes:
       - juseless_account
       - requested_accessories
       - requested_juseless_account_name
-      - requested_juseless_group_membership
+      - juseless_group_membership
       - requested_laptop
       - start_date
       - user_classifications
     slot_usage:
+      family_name:
+        required: true
+        annotations:
+          sh:order: 1
+      given_name:
+        required: true
+        annotations:
+          sh:order: 2
+      additional_names:
+        annotations:
+          sh:order: 3
+      honorific_name_prefix:
+        annotations:
+          sh:order: 4
+      honorific_name_suffix:
+        annotations:
+          sh:order: 5
       start_date:
+        required: true
         description: When this person starts being a user.
+        annotations:
+          sh:order: 6
       end_date:
+        required: true
+        title: (Expected) End date
         description: When this person is expected to stop being a user.
+        annotations:
+          sh:order: 7
+      user_classifications:
+        required: true
+        annotations:
+          sh:order: 8
+      member_of:
+        annotations:
+          sh:order: 9
+      offices:
+        annotations:
+          sh:order: 10
+      emails:
+        recommended: true
+        annotations:
+          sh:order: 11
+      orcid:
+        recommended: true
+        annotations:
+          sh:order: 12
+      requested_juseless_account_name:
+        annotations:
+          sh:order: 13
+      requested_laptop:
+        annotations:
+          sh:order: 14
+      requested_accessories:
+        annotations:
+          sh:order: 15
+      allocated_software_licenses:
+        annotations:
+          sh:order: 16
+      juseless_group_membership:
+        annotations:
+          sh:order: 17
+      juseless_account:
+        annotations:
+          sh:order: 18
+      description:
+        annotations:
+          sh:order: 19
+      display_label:
+        recommended: true
+        annotations:
+          sh:order: 20

src/flat-users/unreleased/examples/User-typical.json

@@ -13,25 +13,29 @@
     "dontango@hhu.de"
   ],
   "orcid": "0000-0001-0000-0000",
+  "display_label": "ZORRO",
+  "curation_comments": [
+    "This is a fictional user, based on a fictional persona. Do not deploy!"
+  ],
+  "end_date": "2073-12-31",
+  "start_date": "2019-04-01",
+  "user_classifications": [
+    "inm7_fzj_employee",
+    "inm7_hhu_employee"
+  ],
   "allocated_software_licenses": [
     "forklift"
   ],
-  "end_date": "2073-12-31",
   "juseless_account": "inm7:juseless-account/zorro",
   "requested_accessories": [
     "headset_std",
     "screen_keyboard_mouse"
   ],
   "requested_juseless_account_name": "eldiabolo",
-  "requested_juseless_group_membership": [
+  "juseless_group_membership": [
     "inm7:juseless-group/tango",
     "inm7:juseless-group/dressedinblack"
   ],
   "requested_laptop": "lenovolinux_new_querty",
-  "start_date": "2019-04-01",
-  "user_classifications": [
-    "inm7_fzj_employee",
-    "inm7_hhu_employee"
-  ],
   "@type": "User"
 }

src/flat-users/unreleased/examples/User-typical.yaml

@@ -1,4 +1,5 @@
 pid: inm7:persons/zorro
+display_label: ZORRO
 family_name: de la Vega
 given_name: Diego
 additional_names:
@@ -18,10 +19,12 @@ start_date: "2019-04-01"
 end_date: "2073-12-31"
 requested_juseless_account_name: eldiabolo
 juseless_account: inm7:juseless-account/zorro
-requested_juseless_group_membership:
+juseless_group_membership:
   - inm7:juseless-group/tango
   - inm7:juseless-group/dressedinblack
 requested_laptop: lenovolinux_new_querty
 requested_accessories:
   - headset_std
   - screen_keyboard_mouse
+curation_comments:
+  - This is a fictional user, based on a fictional persona. Do not deploy!