Merge pull request #53 from MichaelPesce/map-visualization

Read map files to produce excel input templates
project-pareto · Dec 6, 2023 · 30787f2 · 30787f2
2 parents e37709e + 838f70c
commit 30787f2
Show file tree

Hide file tree

Showing 62 changed files with 1,787 additions and 138 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ name: App build
 on:
   push:
     branches:
-      - "multiple-cell-input-bug"
+      - "map-visualization"
 
 defaults:
   run:
@@ -69,15 +69,15 @@ jobs:
 
       - name: Sign Windows Distribution
         run: |
-          AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v electron/dist/ParetoUI-23.11.17-win64.exe
+          AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v electron/dist/ParetoUI-23.12.01-win64.exe
 
       - name: Upload artifact for windows build
         uses: actions/upload-artifact@v3
         if: always()
         with:
             name: windows-pareto-dist
             path: |
-              electron/dist/ParetoUI-23.11.17-win64.exe
+              electron/dist/ParetoUI-23.12.01-win64.exe
   # windows-build:
   #   name: Windows Build
 
@@ -126,4 +126,4 @@ jobs:
   #       with:
   #           name: windows-pareto-dist
   #           path: |
-  #             electron/dist/ParetoUI-23.11.17-win64.exe
+  #             electron/dist/ParetoUI-23.12.01-win64.exe
diff --git a/backend/app/extra-hooks/hook-pareto.py b/backend/app/extra-hooks/hook-pareto.py
@@ -65,4 +65,7 @@
 datas.append(('internal/assets/workshop_beneficial_reuse_override_input.png', 'app/internal/assets'))
 datas.append(('internal/assets/workshop_beneficial_reuse_override_output.png', 'app/internal/assets'))
 
+# add input template
+datas.append(('internal/assets/pareto_input_template.xlsx', 'app/internal/assets'))
+
 print(datas)