Merge f97f75b into a5363c0

open-contracting-archive · Jul 1, 2020 · 9b8544f · 9b8544f
2 parents a5363c0 + f97f75b
commit 9b8544f
Show file tree

Hide file tree

Showing 15 changed files with 453 additions and 148 deletions.
diff --git a/default/decorators.py b/default/decorators.py
@@ -8,7 +8,8 @@
 def clear_files(function):
     @wraps(function)
     def wrap(request, *args, **kwargs):
-        request.session['files'] = []
+        if 'clear' not in request.session or request.session['clear']:
+            request.session['files'] = []
         return function(request, *args, **kwargs)
 
     return wrap

diff --git a/default/static/css/custom.css b/default/static/css/custom.css
@@ -62,25 +62,24 @@
     position: absolute;
     bottom: 0;
     width: 100%;
-    height: 100px;
+    height: 10rem;
     background-color: #222;
 }
-.footer.logo.home-footer {
-    position: relative;
-}
-.footer-brand.ocp-logo{
+.footer-brand.ocp-logo {
     max-width: 100px;
 }
-.footer-brand.ocp-logo svg
-{
+.footer-brand.ocp-logo svg {
     height: 80px;
     margin-top: 10px;
 }
 .page-container.ocp-page {
     position: relative;
     min-height: 100vh;
 }
-}
 .content-wrap.ocp-content {
-    padding-bottom: 2.5rem;
+    padding-bottom: 12rem;
+}
+.form-send {
+    margin-bottom: 0;
+    margin-top: 10px;
 }
diff --git a/default/static/js/uploader.js b/default/static/js/uploader.js
@@ -23,9 +23,14 @@ var app = {};
         $('#upload-button').attr('disabled', true);
     }
 
+    function disableGoButton() {
+        $('#go-button').attr('disabled', true);
+    }
+
     function disableAddFiles() {
         $('.fileinput-button').attr('disabled', true);
         $('.fileinput-button input:file').attr('disabled', true);
+        $('.fileinput-button label').removeAttr("for");
     }
 
     function enableAddFiles() {
@@ -127,6 +132,7 @@ var app = {};
             .done(function (data) {
                 $('.response-success .file-size').html(utils.readableFileSize(data.size));
                 $('.response-success .download').attr('href', data.url);
+                $('.response-success .send-button').attr('data-url', data.url + '?destination=function');
                 $('.response-success').removeClass('hidden');
                 if (data.hasOwnProperty('warnings') && data.warnings.length > 0) {
                     $('.response-warning.action-failed').removeClass('hidden');
@@ -219,6 +225,25 @@ var app = {};
         ;
     }
 
+    function go() {
+        disableGoButton();
+        hideMessages();
+
+        var promises = $.map(_fileItems, function (val) {
+            return val.submit();
+        });
+        performAction($('#fileupload').attr('data-perform-action'));
+    }
+
+    function send_to() {
+        hideMessages();
+        showProcessingModal();
+        $.ajax($('.response-success .send-button').attr('data-url'), { 'dataType': 'json' })
+            .done(function (data) {
+                window.location.href = $('.to-function').val();
+            })
+    }
+
     /** plugin initialization & listeners**/
 
     var fileupload = $('#fileupload')
@@ -234,10 +259,40 @@ var app = {};
     /* click upload url button behaviour */
     $("#url-button").click(upload_url);
 
+    /** go call binding **/
+    $("#go-button").click(go);
+
+    /** click send button behaviour **/
+    $('.send-button').click(send_to);
+
+    /* add warning before closing/navigating away from page */
     window.onload = function () {
         /* clear URL input text */
         $('#input_url_0 input').val('');
 
+        /* check if results were sent to this page */
+        url = '/result/receive/?type=' + JSON.parse($('#fileupload').attr('data-form-data')).type;
+        $.ajax(url, { 'dataType': 'json' })
+            .done(function (data) {
+                if (data.receive_result) {
+                    showProcessingModal();
+                    disableAddFiles();
+                    $('.drop-area').removeClass('empty');
+                    $('.drop-area').addClass('single');
+                    $('.drop-area .file-selector-empty').addClass('hidden');
+                    $('.drop-area .drop-area-received-msg').removeClass('hidden');
+                    $('.drop-area .drop-area-received-msg .file-result').html(data.prefix + data.ext);
+                    $('.actions').removeClass('hidden');
+                    $('#upload-button').addClass('hidden');
+                    $('#go-button').removeClass('hidden');
+                }})
+            .fail(function () {
+                $('.response-warning.file-process-failed').removeClass('hidden');
+            })
+            .always(function () {
+                hideProcessingModal();
+                });
+
         /* add warning before closing/navigating away from page */
         window.addEventListener("beforeunload", function (e) {
             if (_fileItems.length === 0 || _done) {

diff --git a/default/templates/default/base-uploader.html b/default/templates/default/base-uploader.html
@@ -14,13 +14,22 @@
 <div class="response-success alert alert-info hidden">
     <b>{% trans "Success!" %}</b> result.zip(<span class="file-size"></span>)
     <a href="javascript:void(0)" class="download" target="_blank">{% trans "Download" %}</a>
+    <div class="form-group form-inline form-send hidden">
+        <label>{% trans "Send result to function:" %}</label>
+        <select class="form-control to-function">
+            <option id="compile" value="/compile/">{% trans "Compile Releases" %}</option>
+            <option id="upgrade" value="/upgrade/">{% trans "Upgrade from 1.0 to 1.1" %}</option>
+            <option id="convert" value="/to-spreadsheet/">{% trans "Convert to CSV/Excel" %}</option>
+        </select>
+        <a class="send-button" href="#" role="button">{% trans "Send" %}</a>
+    </div>
 </div>
 <div class="response-warning action-failed alert alert-warning hidden">
     <ul></ul>
 </div>
 <div class="response-warning file-process-failed alert alert-warning hidden">
     {% trans "We couldn't check that all files were JSON or of the OCDS type requested." %}
-    {% trans "You can add more files or remove them, then click on <b>Start</b> again." %}
+    {% trans "Please verify each file and try again." %}
     {% trans "Files with validation issues will be ignored by default." %}
 </div>
 <div class="response-fail alert alert-danger hidden">
@@ -126,6 +135,7 @@
             <span class="file-selector-empty"><label for="file">{% trans "Add a file" %}</label> {% trans "or drag and drop here." %}</span>
             <div class="files hidden">
             </div>
+            <span class="drop-area-received-msg hidden">{% trans "<b>Received</b>: " %}<span class="file-result"></span></span>
           </div>
           <div class="actions hidden">
             <div class="buttons">
@@ -136,7 +146,11 @@
               <button type="submit" class="btn btn-primary pull-right start" id="upload-button" disabled>
                 <i class="glyphicon glyphicon-cloud-upload"></i>
                 <span>{% trans "Start" %}</span>
-            </button>
+              </button>
+              <button type="submit" class="btn btn-primary pull-right start hidden" id="go-button">
+                <i class="glyphicon glyphicon-play-circle"></i>
+                <span>{% trans "Process" %}</span>
+              </button>
             </div>
           </div>
         </form>

diff --git a/default/templates/default/base.html b/default/templates/default/base.html
@@ -49,35 +49,35 @@ <h1><a href="/" style="color: white;">{% trans "OCDS Toucan" %}</a> <small> {% b
           {# page content here #}
           {% block body %}{% endblock %}
         </div>
-        {% include 'default/logo.html' %}
-        <footer class="footer logo">
-          <div class="container">
-              <a class="footer-brand ocp-logo" href="http://open-contracting.org">
-                <svg style="margin-left: -30px;">
-                  <use xlink:href="#ocp-logo"/>
-                </svg>
-              </a>
-          </div>
-        </footer>
-    <script src="{% static "js/jquery-3.3.1.min.js" %}"></script>
-    <script src="{% static "js/bootstrap.min.js" %}"></script>
-    <script src="https://use.typekit.net/xpw3jps.js"></script>
-    <script src="{% static "js/language.js" %}"></script>
-    <script>
-        try{Typekit.load({ async: true });}catch(e){}
-    </script>
-    {# additional scripts here #}
-    {% block scripts %}{% endblock %}
-    <!-- Global site tag (gtag.js) - Google Analytics -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-35677147-3"></script>
-    <script>
-      window.dataLayer = window.dataLayer || [];
-      function gtag(){dataLayer.push(arguments);}
-      gtag('js', new Date());
-
-      gtag('config', 'UA-35677147-3');
-    </script>
     </div>
+      {% include 'default/logo.html' %}
+      <footer class="footer logo">
+        <div class="container">
+          <a class="footer-brand ocp-logo" href="http://open-contracting.org">
+            <svg style="margin-left: -30px;">
+              <use xlink:href="#ocp-logo"/>
+            </svg>
+          </a>
+        </div>
+      </footer>
    </div>
   </body>
 </html>
+<script src="{% static "js/jquery-3.3.1.min.js" %}"></script>
+<script src="{% static "js/bootstrap.min.js" %}"></script>
+<script src="https://use.typekit.net/xpw3jps.js"></script>
+<script src="{% static "js/language.js" %}"></script>
+<script>
+    try{Typekit.load({ async: true });}catch(e){}
+</script>
+{# additional scripts here #}
+{% block scripts %}{% endblock %}
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-35677147-3"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-35677147-3');
+</script>
diff --git a/default/templates/default/combine-packages.html b/default/templates/default/combine-packages.html
@@ -36,6 +36,7 @@
 {% block scripts %}
     {{ block.super }}
     <script type="text/javascript">
+    $('.response-success .form-send').removeClass('hidden');
     (function(){
         app.setParams(function(params){
             if ($('.packageType').val() == 'release')

diff --git a/default/templates/default/index.html b/default/templates/default/index.html
@@ -148,7 +148,3 @@
 </div>
 </div>
 {% endblock %}
-
-{% block scripts %}
-<script> $('.footer').addClass('home-footer'); </script>
-{% endblock %}
diff --git a/default/templates/default/package-releases.html b/default/templates/default/package-releases.html
@@ -26,5 +26,8 @@
 
 {% block scripts %}
     {{ block.super }}
+    <script type="text/javascript">
+        $('.response-success .form-send').removeClass('hidden');
+    </script>
     {% include "default/snippets/published_date_scripts.html" %}
 {% endblock %}
diff --git a/default/templates/default/to-json.html b/default/templates/default/to-json.html
@@ -10,13 +10,16 @@
 
 {% block body %}
 <div class="response-success alert alert-info hidden">
-    <b>{% trans "Success!" %}</b>
-    <ul>
-        <li>
-            result.zip (<span class="file-size-json"></span>)
-            <a href="javascript:void(0)" class="download-json">{% trans "Download" %}</a>
-        </li>
-    </ul>
+    <b>{% trans "Success!" %}</b> result.zip(<span class="file-size-json"></span>)
+    <a href="javascript:void(0)" class="download-json">{% trans "Download" %}</a>
+    <div class="form-group form-inline form-send">
+        <label>{% trans "Send result to function:" %}</label>
+        <select class="form-control to-function">
+            <option id="compile" value="/compile/">{% trans "Compile Releases" %}</option>
+            <option id="upgrade" value="/upgrade/">{% trans "Upgrade from 1.0 to 1.1" %}</option>
+        </select>
+        <a class="send-button" href="#" role="button">{% trans "Send" %}</a>
+    </div>
 </div>
 <div class="response-fail alert alert-danger hidden">
     <b>{% trans "An error has occurred!" %}</b>
@@ -144,7 +147,7 @@
 
         $('#fileupload').fileupload('disable');
 
-        /* click upload button behaviour */
+        /** click upload button behaviour **/
         $('#upload-button').click(function(){
             $('#fileupload').fileupload('option', 'dropZone', undefined)
             data
@@ -155,6 +158,7 @@
                         .done(function(data){
                             $('.response-success .download-json').attr('href', data.url);
                             $('.response-success .file-size-json').html(utils.readableFileSize(data.size));
+                            $('.response-success .send-button').attr('data-url', data.url + '?destination=function');
                             $('.response-success').removeClass('hidden');
                             })
                         .fail(function(){
@@ -171,7 +175,16 @@
         });
     });
 
-    /* click url button behaviour */
+    /** click send button behaviour **/
+    $('.send-button').click(function(){
+        $('#processing-modal').modal('show');
+        $.ajax($('.response-success .send-button').attr('data-url'), { 'dataType': 'json' })
+            .done(function (data) {
+                window.location.href = $('.to-function').val();
+            })
+    });
+
+    /** click url button behaviour **/
     $("#url-button-ts").click(function(){
         $('.response-warning').addClass('hidden');
         $('#processing-modal').modal('show');