src/flat-users/unreleased.yaml

@@ -102,6 +102,41 @@ enums:
       external:
         description: An person with no formal direct affiliation with the INM7.
 
+  RequestableLaptop:
+    description: >-
+      Requestable configurations for INM-7 provided laptops.
+    permissible_values:
+      mac_new_querty:
+        description: Mac with US keyboard layout, max one year old.
+      mac_new_quertz:
+        description: Mac with German keyboard layout, max one year old.
+      mac_used_querty:
+        description: Mac with US keyboard layout, max five years old.
+      mac_used_quertz:
+        description: Mac with German keyboard layout, max five years old.
+      lenovolinux_new_querty:
+        description: Lenovo laptop running Linux with US keyboard layout, max one year old.
+      lenovolinux_new_quertz:
+        description: Lenovo laptop running Linux with German keyboard layout, max one year old.
+      lenovolinux_used_querty:
+        description: Lenovo laptop running Linux with US keyboard layout, max five years old.
+      lenovolinux_used_quertz:
+        description: Lenovo laptop running Linux with German keyboard layout, max five years old.
+      other:
+        description: Non-standard equipment, specify in comments.
+
+  RequestableAccessory:
+    description: Requestable accessories for INM-7 users
+    permissible_values:
+      screen_keyboard_mouse:
+        description: Package with screen (Dell 27 inch with built-in USB-C Dock), keyboard, and mouse.
+      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.
+      other:
+        description: Other kind of accessory, specify in comments.
+
 slots:
   allocated_software_licenses:
     title: License allocation
@@ -127,6 +162,16 @@ slots:
     description: Assigned account on the Juseless system
     range: JuselessAccount
 
+  requested_accessories:
+    title: Requested accessories
+    description: >-
+      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.
+    range: RequestableAccessory
+    multivalued: true
+
   requested_juseless_account_name:
     title: Preferred user name
     description: Name of a (to be created) account
@@ -140,6 +185,15 @@ slots:
     range: JuselessGroup
     multivalued: true
 
+  requested_laptop:
+    title: Requested laptop
+    description: >-
+      Mac or Lenovo laptops can be provided. Lenovo laptops run Linux.
+      Category "new" laptops are max one year old, "used" laptops are
+      max five years old (4-cores, 16G RAM, 512G SSD). US (querty) and
+      German (quertz) keyboards are possible.
+    range: RequestableLaptop
+
   user_classifications:
     title: Organization type
     description: >-
@@ -180,8 +234,10 @@ classes:
       - allocated_software_licenses
       - end_date
       - juseless_account
+      - requested_accessories
       - requested_juseless_account_name
       - requested_juseless_group_membership
+      - requested_laptop
       - start_date
       - user_classifications
     slot_usage:
@@ -189,4 +245,3 @@ classes:
         description: When this person starts being a user.
       end_date:
         description: When this person is expected to stop being a user.
-

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

@@ -18,11 +18,16 @@
   ],
   "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": [
     "inm7:juseless-group/tango",
     "inm7:juseless-group/dressedinblack"
   ],
+  "requested_laptop": "lenovolinux_new_querty",
   "start_date": "2019-04-01",
   "user_classifications": [
     "inm7_fzj_employee",

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

@@ -21,3 +21,7 @@ juseless_account: inm7:juseless-account/zorro
 requested_juseless_group_membership:
   - inm7:juseless-group/tango
   - inm7:juseless-group/dressedinblack
+requested_laptop: lenovolinux_new_querty
+requested_accessories:
+  - headset_std
+  - screen_keyboard_mouse