remove job from ciziten document, add custom name to my documents

kac5a · Mar 22, 2023 · 2f22a57 · 2f22a57
1 parent 0953dea
commit 2f22a57
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 29 deletions.
diff --git a/fxmanifest.lua b/fxmanifest.lua
@@ -2,8 +2,8 @@ fx_version "cerulean"
 
 description "A better document management script"
 author "K5 Scripts"
-version '1.3.2'
-update "Fixed missing customName header text, and random printed messages"
+version '1.3.4'
+update "Removed issuer job from citizen documents, added custom name column to received documents"
 repository 'https://github.com/kac5a/k5_documents'
 
 lua54 'yes'

diff --git a/web/build/asset-manifest.json b/web/build/asset-manifest.json
@@ -1,11 +1,11 @@
 {
   "files": {
-    "main.js": "/web/build/static/js/main.44088540.js",
+    "main.js": "/web/build/static/js/main.a9020f42.js",
     "static/media/city_logo.png": "/web/build/static/media/city_logo.008b591a2d4e6445d96c.png",
     "index.html": "/web/build/index.html",
-    "main.44088540.js.map": "/web/build/static/js/main.44088540.js.map"
+    "main.a9020f42.js.map": "/web/build/static/js/main.a9020f42.js.map"
   },
   "entrypoints": [
-    "static/js/main.44088540.js"
+    "static/js/main.a9020f42.js"
   ]
 }
diff --git a/web/build/index.html b/web/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="preconnect" href="https://fonts.googleapis.com"/><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin/><link href="https://fonts.googleapis.com/css2?family=Oooh+Baby&display=swap" rel="stylesheet"/><title>K5 Documents</title><script type="text/javascript" src="/web/build/config.js"></script><link rel="stylesheet" href="/web/build/customstyle.css"/><script defer="defer" src="/web/build/static/js/main.44088540.js"></script></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="preconnect" href="https://fonts.googleapis.com"/><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin/><link href="https://fonts.googleapis.com/css2?family=Oooh+Baby&display=swap" rel="stylesheet"/><title>K5 Documents</title><script type="text/javascript" src="/web/build/config.js"></script><link rel="stylesheet" href="/web/build/customstyle.css"/><script defer="defer" src="/web/build/static/js/main.a9020f42.js"></script></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/web/build/static/js/main.44088540.js.map b/web/build/static/js/main.44088540.js.map
diff --git a/web/build/static/js/main.44088540.js → web/build/static/js/main.a9020f42.js b/web/build/static/js/main.44088540.js → web/build/static/js/main.a9020f42.js
diff --git a/...ld/static/js/main.44088540.js.LICENSE.txt → ...ld/static/js/main.a9020f42.js.LICENSE.txt b/...ld/static/js/main.44088540.js.LICENSE.txt → ...ld/static/js/main.a9020f42.js.LICENSE.txt
diff --git a/web/build/static/js/main.a9020f42.js.map b/web/build/static/js/main.a9020f42.js.map
diff --git a/web/build/static/js/main.cd38447b.js.map b/web/build/static/js/main.cd38447b.js.map
diff --git a/web/src/components/Components/DocumentView.tsx b/web/src/components/Components/DocumentView.tsx
@@ -54,16 +54,16 @@ const DocumentView = () => {
                       <Grid item xs={6}>
                         <IssuerTitle>{texts.issuerDOB}</IssuerTitle>
                       </Grid>
-                      <Grid item xs={6}>
+                      {document?.issuer.jobName ?  <Grid item xs={6}>
                         <IssuerTitle>{texts.issuerJob}</IssuerTitle>
-                      </Grid>
+                      </Grid>: <Grid item xs={6}/>}
 
                       <Grid item xs={6} >
                         <IssuerData>{moment(new Date(document?.issuer.birthDate || "")).format(DATE_FORMAT_SHORT)}</IssuerData>
                       </Grid>
-                      <Grid item xs={6}>
+                      {document?.issuer.jobName ? <Grid item xs={6}>
                         <IssuerData>{ document?.issuer.jobName }</IssuerData>
-                      </Grid>
+                      </Grid> : <Grid item xs={6}/>}
 
                     </Grid>
                   </CardContent>

diff --git a/web/src/components/Components/DocumentViewFromPlayer.tsx b/web/src/components/Components/DocumentViewFromPlayer.tsx
@@ -55,16 +55,16 @@ const DocumentViewFromPlayer = () => {
                       <Grid item xs={6}>
                         <IssuerTitle>{texts.issuerDOB}</IssuerTitle>
                       </Grid>
-                      <Grid item xs={6}>
+                      {document?.issuer.jobName ? <Grid item xs={6}>
                         <IssuerTitle>{texts.issuerJob}</IssuerTitle>
-                      </Grid>
+                      </Grid> : <Grid item xs={6}/>}
 
                       <Grid item xs={6} >
                         <IssuerData>{moment(new Date(document?.issuer.birthDate || "")).format(DATE_FORMAT_SHORT)}</IssuerData>
                       </Grid>
-                      <Grid item xs={6}>
+                      {document?.issuer.jobName ? <Grid item xs={6}>
                         <IssuerData>{ document?.issuer.jobName }</IssuerData>
-                      </Grid>
+                      </Grid> : <Grid item xs={6}/>}
 
                     </Grid>
                   </CardContent>

diff --git a/web/src/components/Components/Forms/CreateDocument.tsx b/web/src/components/Components/Forms/CreateDocument.tsx
@@ -15,9 +15,10 @@ type Props = {
   handleCreate: (data: K5Document) => void
   handleClose: () => void
   logoSrc: string
+  isCitizen?: boolean
 }
 
-const CreateDocument = ({ template, handleCreate, handleClose, logoSrc }: Props) => {
+const CreateDocument = ({ template, handleCreate, handleClose, logoSrc, isCitizen }: Props) => {
 
   const { playerData } = usePlayerData()
   const { job } = useJob()
@@ -55,7 +56,7 @@ const CreateDocument = ({ template, handleCreate, handleClose, logoSrc }: Props)
       name: data.name,
       createdAt: (new Date()).toString(),
       customName: data.customName?.length ? data.customName : undefined,
-      job: job?.name,
+      job: !isCitizen ? job?.name : undefined,
       description: data.description,
       fields: data.fields,
       isCopy: false,
@@ -65,7 +66,7 @@ const CreateDocument = ({ template, handleCreate, handleClose, logoSrc }: Props)
         firstname: playerData?.firstname,
         lastname: playerData?.lastname,
         birthDate: moment(new Date(playerData?.dateofbirth || "")).format(DATE_FORMAT_SHORT),
-        jobName: job?.label
+        jobName: !isCitizen ? job?.label : undefined
       }
     } as K5Document
 
@@ -113,16 +114,17 @@ const CreateDocument = ({ template, handleCreate, handleClose, logoSrc }: Props)
                       <Grid item xs={6}>
                         <Typography style={{fontWeight: "bold", fontSize: "0.7rem"}}>{texts.issuerDOB}</Typography>
                       </Grid>
-                      <Grid item xs={6}>
+                      {!isCitizen ? <Grid item xs={6}>
                         <Typography style={{fontWeight: "bold", fontSize: "0.7rem"}}>{texts.issuerJob}</Typography>
-                      </Grid>
+                      </Grid> :
+                        <Grid item xs={6} />}
 
                        <Grid item xs={6} >
                         <Typography style={{ fontSize: "0.9rem" }}>{moment(new Date(playerData?.dateofbirth || "")).format(DATE_FORMAT_SHORT)}</Typography>
                       </Grid>
-                      <Grid item xs={6}>
+                      {!isCitizen ? <Grid item xs={6}>
                         <Typography style={{ fontSize: "0.9rem" }}>{ job?.label }</Typography>
-                      </Grid>
+                      </Grid> : <Grid item xs={6} />}
 
                     </Grid>
                   </CardContent>

diff --git a/web/src/components/Pages/IssuedDocuments.tsx b/web/src/components/Pages/IssuedDocuments.tsx
@@ -22,6 +22,7 @@ const IssuedDocuments = () => {
 
   const [isDocumentFormOpen, setDocumentFormOpen] = useState(false)
   const [isTemplateListOpen, setTemplateListOpen] = useState(false)
+  const [isCitizenDocument, setCitizenDocument] = useState(false)
   const [isCitizenListOpen, setCitizenListOpen] = useState(false)
   const [logoSrc, setLogoSrc] = useState(city_logo)
   const [documentTemplate, setDocumentTemplate] = useState<DocumentTemplate | undefined>()
@@ -116,7 +117,15 @@ const IssuedDocuments = () => {
 
   const handleTemplateSelect = (t: DocumentTemplate, citizen: boolean) => {
     setTemplateListOpen(false)
-    citizen ? setLogoSrc(city_logo) : setLogoSrc(availableJobs.find(j => j.job === job?.name)?.logo || city_logo)
+    setCitizenListOpen(false)
+    if (citizen) {
+      setLogoSrc(city_logo)
+      setCitizenDocument(true)
+    } else {
+      setLogoSrc(availableJobs.find(j => j.job === job?.name)?.logo || city_logo)
+      setCitizenDocument(false)
+    }
+
     setDocumentTemplate(t)
     setDocumentFormOpen(true)
   }
@@ -146,7 +155,7 @@ const IssuedDocuments = () => {
       <Dialog maxWidth="md" open={isDocumentFormOpen} onClose={() => {
         setDocumentFormOpen(false)
       }}>
-        <CreateDocument handleCreate={handleCreate} logoSrc={logoSrc} template={documentTemplate!} handleClose={() => {
+        <CreateDocument isCitizen={isCitizenDocument} handleCreate={handleCreate} logoSrc={logoSrc} template={documentTemplate!} handleClose={() => {
           setDocumentFormOpen(false)
         }} />
       </Dialog>

diff --git a/web/src/components/Pages/MyDocuments.tsx b/web/src/components/Pages/MyDocuments.tsx
@@ -38,9 +38,14 @@ const MyDocuments = () => {
   }, [documentCopies, handleGetDocumentCopies])
 
   const columns: GridColumns<K5Document> = [
+    {
+      field: 'customName',
+      headerName: texts.customDocumentName,
+      flex: 1,
+    },
     {
       field: 'name',
-      headerName: texts.documentName,
+      headerName: texts.documentType,
       flex: 1,
     },
     {