Merge branch 'main' of https://github.com/icefoganalytics/signing-authority

Author: datajohnson

api/src/routes/authorities.ts

@@ -109,6 +109,44 @@ authoritiesRouter.get(
   }
 );
 
+authoritiesRouter.post("/bulk-pdf", ReturnValidationErrors, async (req: Request, res: Response) => {
+  const { ids } = req.body;
+  const idList = eval(ids);
+
+  const PDF_TEMPLATE = fs.readFileSync(__dirname + "/../templates/pdf/FormBTemplate.html");
+
+  let allItemData = "";
+
+  for (let id of idList) {
+    let item = await loadSingleAuthority(req, id);
+
+    if (item) {
+      (item as any).API_PORT = API_PORT;
+
+      if (item.authority_type == "temporary") item.authority_type = "TEMPORARY";
+      else if (item.authority_type == "acting") item.authority_type = "ACTING";
+      else item.authority_type = "SUBSTANTIVE";
+
+      let t = new ExpressHandlebars();
+
+      const template = t.handlebars.compile(PDF_TEMPLATE.toString(), {});
+      let data = template(item, {
+        helpers: {
+          eq: function (a1: string, a2: string) {
+            return a1 == a2;
+          },
+        },
+      });
+
+      allItemData += data + '<div style="page-break-after: always;"></div>';
+    }
+  }
+  let pdf = await generatePDF(allItemData);
+  res.setHeader("Content-disposition", `attachment; filename="FormB_BULKPRINT.pdf"`);
+  res.setHeader("Content-type", "application/pdf");
+  res.send(pdf);
+});
+
 authoritiesRouter.get(
   "/:id/pdf/draft",
   [param("id").isMongoId().notEmpty()],

api/src/routes/integration-router.ts

@@ -9,8 +9,6 @@ integrationRouter.use(RequiresData);
 
 integrationRouter.get("/authorities-for-user/:email", async (req: Request, res: Response) => {
   const { email } = req.params;
-  console.log("Authorities requested for", email);
-
   let db = req.store.Authorities as GenericService<Authority>;
   let regex = RegExp(email, "i");
   let auths = await db.getAll({ "employee.email": { $regex: regex } });
@@ -37,7 +35,5 @@ integrationRouter.get("/authorities-for-user/:email", async (req: Request, res:
     results.push({ email: auth.employee.email, authority_lines, modified_date });
   }
 
-  console.log("** Sending", results.length);
-
   res.json({ data: results });
 });

k8s/manifests-qa/ingress.yaml

@@ -1,6 +1,6 @@
 #The commented out sections below are for when the application is set up for SSL
 #They should be uncommented out when application is SSL enabled
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: signing-authority-qa-ingressroute
@@ -24,7 +24,7 @@ spec:
     secretName: signing-authority-cert
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: http-to-https-redirect
@@ -42,7 +42,7 @@ spec:
         - name: signing-authority-qa
           port: 3000
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: redirect-to-https

k8s/manifests-test/ingress.yaml

@@ -1,6 +1,6 @@
 #The commented out sections below are for when the application is set up for SSL
 #They should be uncommented out when application is SSL enabled
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: signing-authority-test-ingressroute
@@ -24,7 +24,7 @@ spec:
     secretName: signing-authority-cert
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: http-to-https-redirect
@@ -42,7 +42,7 @@ spec:
         - name: signing-authority-test
           port: 3000
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: redirect-to-https

web/src/modules/departments/views/DepartmentFormBList.vue

@@ -53,7 +53,7 @@
                 background-color="white"
               />
             </v-col>
-            <v-col cols="12" md="6">
+            <v-col cols="12" md="6" class="d-flex">
               <v-select
                 label="Activity"
                 prepend-inner-icon="mdi-filter"
@@ -66,6 +66,7 @@
                 hide-details
                 background-color="white"
               />
+              <v-btn class="my-0 ml-5" style="height: 40px" color="secondary" @click="printClick"> Bulk Print</v-btn>
             </v-col>
           </v-row>
 
@@ -89,12 +90,47 @@
         </v-card-text>
       </v-card>
     </BaseCard>
+
+    <v-dialog v-model="showPrintDialog" persistent width="600">
+      <v-app-bar dark color="#0097A9">
+        <v-toolbar-title>Generate Form A</v-toolbar-title>
+        <v-spacer />
+        <v-icon title="Close" @click="closePrintDialog">mdi-close</v-icon>
+      </v-app-bar>
+      <v-card tile>
+        <v-card-text class="pt-3">
+          <p>
+            This procedure bulk prints all of the Form B authorizations listed below. You can remove items from the list
+            by clicking the "X" on the right side.
+          </p>
+
+          <v-list dense>
+            <div v-for="(item, idx) of printList" :key="idx">
+              <v-divider></v-divider>
+              <v-list-item>
+                <v-list-item-content>
+                  {{ item.employee.title }} - {{ item.employee.name }} ({{ convertType(item.authority_type) }})
+                </v-list-item-content>
+                <v-list-item-icon>
+                  <v-btn color="warning" class="my-0" small icon @click="removeMatchingItem(idx)"
+                    ><v-icon>mdi-close</v-icon></v-btn
+                  >
+                </v-list-item-icon>
+              </v-list-item>
+            </div>
+          </v-list>
+
+          <v-btn color="primary" class="mb-0" @click="doPrint" :disabled="printList.length == 0">Print All</v-btn>
+        </v-card-text>
+      </v-card>
+    </v-dialog>
   </v-container>
 </template>
 
 <script>
 import { mapActions, mapState } from "vuex";
 import { clone, uniq, isEmpty } from "lodash";
+import { AUTHORITY_URL } from "@/urls";
 import createFormB from "@/modules/forms/formB/components/createFormB.vue";
 
 export default {
@@ -144,6 +180,9 @@ export default {
     formBItems: [],
     loadingFormB: false,
     formBLink: "",
+
+    showPrintDialog: false,
+    printList: [],
   }),
   mounted: async function() {
     this.departmentId = this.$route.params.departmentId;
@@ -269,7 +308,6 @@ export default {
       }
 
       if (this.programFilter != "All") {
-        console.log("FILTER ON ", this.programFilter);
         list = list.filter((i) => i.program_branch == this.programFilter);
       }
 
@@ -284,6 +322,42 @@ export default {
       if (input == "acting") return "Acting";
       return "Substantive";
     },
+
+    printClick() {
+      this.printList = clone(this.allItems);
+
+      this.showPrintDialog = true;
+    },
+
+    doPrint() {
+      const idList = this.printList.map((item) => item._id);
+
+      // do a post to a _blank window with the ids in the body
+      const form = document.createElement('form');
+      form.method = 'POST';
+      form.action = `${AUTHORITY_URL}/bulk-pdf`;
+      form.target = '_blank';
+      
+      const input = document.createElement('input');
+      input.type = 'hidden';
+      input.name = 'ids';
+      input.value = JSON.stringify(idList);
+      
+      form.appendChild(input);
+      document.body.appendChild(form);
+      form.submit();
+      document.body.removeChild(form);
+
+      // return `${AUTHORITY_URL}/${this.formB._id}/pdf`;
+    },
+
+    removeMatchingItem(idx) {
+      this.printList.splice(idx, 1);
+    },
+
+    closePrintDialog() {
+      this.showPrintDialog = false;
+    },
   },
 };
 </script>

web/src/modules/departments/views/DepartmentPendingGroupDetail.vue

@@ -161,6 +161,8 @@
               <strong>{{ item.activity }}</strong>
             </v-card-subtitle>
             <v-card-text>
+              <v-alert v-if="item.status == 'Archived'" color="warning" outlined>This Form A is 'Archived' and is no longer valid.</v-alert>
+
               <v-data-table
                 :headers="headers"
                 :items="item.positions"

web/src/modules/departments/views/DepartmentPositionList.vue

@@ -43,7 +43,7 @@
             <v-card-title>Delegations by Position</v-card-title>
             <v-card-text>
               <v-row>
-                <v-col>
+                <v-col cols="4">
                   <v-select
                     label="Filter Program"
                     v-model="programFilter"
@@ -54,7 +54,7 @@
                     background-color="white"
                   />
                 </v-col>
-                <v-col>
+                <v-col class="d-flex">
                   <v-select
                     label="Filter Activity"
                     v-model="activityFilter"
@@ -65,17 +65,16 @@
                     outlined
                     background-color="white"
                   />
-                </v-col>
-                <v-col>
                   <v-btn
                     :disabled="!canGenerate"
                     color="secondary"
-                    class="my-0"
+                    class="my-0 ml-5"
+                    style="height: 40px"
                     @click="generateFormAClick"
                     v-if="canAdminister"
                     >Generate Form A</v-btn
-                  ></v-col
-                >
+                  >
+                </v-col>
               </v-row>
 
               <v-data-table
@@ -456,6 +455,10 @@ export default {
 
       return item.position;
     },
+
+    closeUpdateDialog() {
+      this.showUpdateDialog = false;
+    },
   },
 };
 </script>