Merge branch 'allow-zip-upload' into 'development'

Allow zip upload

See merge request saburly/wiaas/wiaas-legacy!10

api-wiaas/.gitignore

@@ -1,4 +1,3 @@
 node_modules/
-client/uploads
 api-wiaas/client/js/bower_components
 vendor

api-wiaas/client/uploads/OrderAgreement/.gitignore

@@ -0,0 +1,8 @@
+# .gitignore sample 
+###################
+
+# ignore all files in this dir...
+*
+
+# ... except for this one.
+!.gitignore

api-wiaas/client/uploads/Statements/.gitignore

@@ -0,0 +1,8 @@
+# .gitignore sample 
+###################
+
+# ignore all files in this dir...
+*
+
+# ... except for this one.
+!.gitignore

api-wiaas/client/uploads/TemplateAgreement/.gitignore

@@ -0,0 +1,8 @@
+# .gitignore sample 
+###################
+
+# ignore all files in this dir...
+*
+
+# ... except for this one.
+!.gitignore

api-wiaas/client/uploads/configuration/.gitignore

@@ -0,0 +1,8 @@
+# .gitignore sample 
+###################
+
+# ignore all files in this dir...
+*
+
+# ... except for this one.
+!.gitignore

api-wiaas/client/uploads/customerAcceptance/.gitignore

@@ -0,0 +1,8 @@
+# .gitignore sample 
+###################
+
+# ignore all files in this dir...
+*
+
+# ... except for this one.
+!.gitignore

api-wiaas/client/uploads/installGuide/.gitignore

@@ -0,0 +1,8 @@
+# .gitignore sample 
+###################
+
+# ignore all files in this dir...
+*
+
+# ... except for this one.
+!.gitignore

api-wiaas/client/uploads/installationProtocol/.gitignore

@@ -0,0 +1,8 @@
+# .gitignore sample 
+###################
+
+# ignore all files in this dir...
+*
+
+# ... except for this one.
+!.gitignore

api-wiaas/client/uploads/orderQuestionaire/.gitignore

@@ -0,0 +1,8 @@
+# .gitignore sample 
+###################
+
+# ignore all files in this dir...
+*
+
+# ... except for this one.
+!.gitignore

api-wiaas/client/uploads/templateQuestionaire/.gitignore

@@ -0,0 +1,8 @@
+# .gitignore sample 
+###################
+
+# ignore all files in this dir...
+*
+
+# ... except for this one.
+!.gitignore

api-wiaas/server/components/v1/documents/templates/DocumentsAddTemplate.php

@@ -36,7 +36,7 @@
             ng-model="files"
             ngf-drag-over-class="'dragover'"
             ngf-select="uploadFile($file)"
-            ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods'"
+            ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.zip'"
             ngf-max-size="20MB"
             class="drop-box">{{'documents.headers.SELECT_DOCUMENT' | translate}}</div>
     </form>

api-wiaas/server/components/v1/orders/templates/AddDocumentsToOrderLayer.html

@@ -38,7 +38,7 @@
                     ng-model="files"
                     ngf-drag-over-class="'dragover'"
                     ngf-select="uploadFile($file)"
-                    ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg'"
+                    ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg,.zip'"
                     ngf-max-size="20MB"
                     class="drop-box">{{'orders.headers.SELECT_DOCUMENT' | translate}}</div>
             </div>

api-wiaas/server/components/v1/orders/templates/InstallationSchedulerBrokerTemplate.php

@@ -52,7 +52,7 @@
                                 ng-model="files"
                                 ngf-drag-over-class="'dragover'"
                                 ngf-select="uploadFile($file)"
-                                ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg'"
+                                ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg,.zip'"
                                 ngf-max-size="20MB"
                                 class="drop-box">{{'orders.headers.SELECT_INSTALL_DOCUMENT' | translate}}</div>
                         </form>

api-wiaas/server/components/v1/orders/templates/InstallationSchedulerSupplierTemplate.php

@@ -21,7 +21,7 @@
                             ng-model="files"
                             ngf-drag-over-class="'dragover'"
                             ngf-select="uploadFile($file)"
-                            ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg'"
+                            ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg,.zip'"
                             ngf-max-size="20MB"
                             class="drop-box">{{'orders.headers.SELECT_INSTALL_DOCUMENT' | translate}}</div>
                     </form>

api-wiaas/server/components/v1/orders/templates/extra-actions/customerAcceptanceCustomerTemplate.php

@@ -21,7 +21,7 @@
             ng-model="files"
             ngf-drag-over-class="'dragover'"
             ngf-select="uploadFile($file)"
-            ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.jpg,.png,.jpeg'"
+            ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.jpg,.png,.jpeg,.zip'"
             ngf-max-size="20MB"
             class="drop-box">{{'orders.headers.SELECT_ACCEPT_DOCUMENT' | translate}}</div>
     </form>

api-wiaas/server/components/v1/orders/templates/extra-actions/procurementBrokerTemplate.php

@@ -15,7 +15,7 @@
             ng-model="files"
             ngf-drag-over-class="'dragover'"
             ngf-select="uploadFile($file, supplier.idSupplier)"
-            ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods'"
+            ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.zip'"
             ngf-max-size="20MB"
             class="drop-box">{{'orders.headers.SELECT_CONFIG_DOCUMENT' | translate}}</div>
     </form>

api-wiaas/server/components/v1/orders/templates/extra-actions/validateQuestionnaireCustomerTemplate.php

@@ -41,7 +41,7 @@
                 ng-model="files"
                 ngf-drag-over-class="'dragover'"
                 ngf-select="uploadFile($file, document.idDocument)"
-                ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods'"
+                ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.zip'"
                 ngf-max-size="20MB"
                 class="drop-box">{{'orders.headers.SELECT_QUESTIONAIRE' | translate}}</div>
         </form>

api-wiaas/server/components/v1/shop/templates/ShopCartTemplate.php

@@ -73,7 +73,7 @@
                             ng-model="files"
                             ngf-drag-over-class="'dragover'"
                             ngf-select="uploadFile($file, document.idPackage, 'questionnaire')"
-                            ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods'"
+                            ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.zip'"
                             ngf-max-size="20MB"
                             class="drop-box">{{'shop.labels.SELECT_QUESTIONAIRE' | translate}}</div>
                     </form>
@@ -113,7 +113,7 @@
                             ng-model="files"
                             ngf-drag-over-class="'dragover'"
                             ngf-select="uploadFile($file, document.idPackage, 'agreement')"
-                            ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg'"
+                            ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg,.zip'"
                             ngf-max-size="20MB"
                             class="drop-box">{{'shop.labels.SELECT_AGREEMENT' | translate}}</div>
                     </form>

api-wiaas/server/components/v1/suppliers/templates/UploadProductDocumentTempalte.php

@@ -40,7 +40,7 @@
         ng-model="files"
         ngf-drag-over-class="'dragover'"
         ngf-select="uploadFile($file)"
-        ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg'"
+        ngf-pattern="'.pdf,.docx,.doc,.xlsx,.xls,.odt,.ods,.png,.jpg,.jpeg,.zip'"
         ngf-max-size="20MB"
         class="drop-box">Select Document</div>
 </div>

php.dockerfile

@@ -61,4 +61,6 @@ RUN cp -r build/* /var/www/html/
 
 COPY docker/php/.htaccess /var/www/html/
 
+RUN chown -R www-data:www-data /var/www/html
+
 CMD /init-scripts/startup.sh