Add national id field to journeyman table view

island-is · Aug 13, 2024 · d6c2a93 · d6c2a93
1 parent 7787f48
commit d6c2a93
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/apps/web/components/connected/syslumenn/TableLists/JourneymanList/JourneymanList.tsx b/apps/web/components/connected/syslumenn/TableLists/JourneymanList/JourneymanList.tsx
@@ -262,6 +262,7 @@ const JourneymanList = ({ slice }: JourneymanListProps) => {
                 <T.Row>
                   <T.HeadData>{n('name', 'Nafn')}</T.HeadData>
                   <T.HeadData>{n('profession', 'Iðngrein')}</T.HeadData>
+                  <T.HeadData>{n('dateOfPublication', 'Útgáfuár')}</T.HeadData>
                   <T.HeadData align="right">
                     {n('dateOfPublication', 'Útgáfuár')}
                   </T.HeadData>
@@ -285,16 +286,11 @@ const JourneymanList = ({ slice }: JourneymanListProps) => {
                           </Box>
                         </T.Data>
                         <T.Data>
-                          {licences.dateOfPublication && (
-                            <Box>
-                              <Text textAlign="right" variant="small">
-                                {format(
-                                  new Date(licences.dateOfPublication),
-                                  'yyyy',
-                                )}
-                              </Text>
-                            </Box>
-                          )}
+                          <Box>
+                            <Text textAlign="right" variant="small">
+                              {licences.nationalId}
+                            </Text>
+                          </Box>
                         </T.Data>
                       </T.Row>
                     )

diff --git a/apps/web/components/connected/syslumenn/TableLists/JourneymanList/queries.ts b/apps/web/components/connected/syslumenn/TableLists/JourneymanList/queries.ts
@@ -7,6 +7,7 @@ export const GET_JOURNEYMAN_LICENCES_QUERY = gql`
         name
         dateOfPublication
         profession
+        nationalId
       }
     }
   }

diff --git a/libs/clients/syslumenn/src/clientConfig.json b/libs/clients/syslumenn/src/clientConfig.json
@@ -3210,6 +3210,9 @@
         "nafn": {
           "type": "string"
         },
+        "kennitala": {
+          "type": "string"
+        },
         "idngrein": {
           "type": "string"
         },
@@ -3432,6 +3435,9 @@
         "nafn": {
           "type": "string"
         },
+        "kennitala": {
+          "type": "string"
+        },
         "starfsrettindi": {
           "type": "string"
         }
@@ -4626,6 +4632,10 @@
         },
         "malsvari": {
           "$ref": "#/definitions/Malsvari"
+        },
+        "arfshlutfall": {
+          "type": "number",
+          "format": "decimal"
         }
       }
     },

diff --git a/libs/clients/syslumenn/src/lib/syslumennClient.types.ts b/libs/clients/syslumenn/src/lib/syslumennClient.types.ts
@@ -397,6 +397,7 @@ export interface JourneymanLicence {
   name?: string
   dateOfPublication?: Date
   profession?: string
+  nationalId?: string
 }
 
 export interface ProfessionRight {

diff --git a/libs/clients/syslumenn/src/lib/syslumennClient.utils.ts b/libs/clients/syslumenn/src/lib/syslumennClient.utils.ts
@@ -556,6 +556,7 @@ export const mapJourneymanLicence = (
     name: licence.nafn,
     dateOfPublication: licence.gildirFra,
     profession: licence.idngrein,
+    nationalId: licence.kennitala,
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ export const GET_JOURNEYMAN_LICENCES_QUERY = gql` @@
             name
             dateOfPublication
             profession
+            nationalId
           }
         }
       }
@@ Expand Down @@