Merge pull request #27 from rafaelpezzuto/include-version-number

Inclui número da versão do pacote
scieloorg · Oct 27, 2021 · 99a426f · 99a426f
2 parents a002116 + ff9028a
commit 99a426f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/spf/core/static/js/main.js b/spf/core/static/js/main.js
@@ -1,6 +1,6 @@
-function createMessage(msg){
+function createMessage(msg, alert_class){
     divAlert = document.createElement('div');
-    divAlert.classList.add('alert', 'alert-danger', 'alert-dismissible', 'fade', 'show', 'is-no-rounded', 'm-0', 'p-2');
+    divAlert.classList.add('alert', alert_class, 'alert-dismissible', 'fade', 'show', 'is-no-rounded', 'm-0', 'p-2');
     divAlert.setAttribute('role', 'alert');
 
     divContainer = document.createElement('div');
@@ -34,31 +34,34 @@ function ingressPackageDownloadToggleSpinner(){
 function ingressPackageDownloadCreateTable(data){
     tableBody = document.getElementById('resultSearchPackagesTableBody')
 
-    for (k in data['doc_pkg']){
-        els = data['doc_pkg'][k];
+    counter = 1
+    for (k in data['doc_pkgs']){
+        els = data['doc_pkgs'][k];
         row = tableBody.insertRow(-1);
 
-        aResult = document.createElement('a')
-        aResult.text = els['name'];
-        aResult.href = els['uri'];
-        aResult.classList.add('link');
-
         tdUri = row.insertCell(-1);
-        tdUri.appendChild(aResult);
+        tdUri.innerHTML = counter;
+
+        aPkgName = document.createElement('a')
+        aPkgName.text = els['name'];
+        aPkgName.href = els['uri'];
+        aPkgName.classList.add('link');
+
+        tdPkgName = row.insertCell(-1);
+        tdPkgName.appendChild(aPkgName);
 
-        tdCreated = row.insertCell(-1);
-        tdCreated.innerHTML = els['created'];
+        tdCreated = row.insertCell(-1)
+        tdCreated.innerHTML = new Date(els['created']);
 
-        tdUpdated = row.insertCell(-1);
-        tdUpdated.innerHTML = els['updated'];
+        counter += 1;
     }
 
-    if (data['doc_pkg'].length > 0) {
+    if (data['doc_pkgs'].length > 0) {
         document.getElementById('resultSearchPackages').style.display = 'block';
     } else {
         var divBaseMessages = document.getElementById('baseMessages');
         for (k in data['errors']){
-            element_message = createMessage(data['errors'][k]);
+            element_message = createMessage(data['errors'][k], 'alert-danger');
             divBaseMessages.append(element_message);
         }
     }

diff --git a/spf/core/templates/ingress/package_download.html b/spf/core/templates/ingress/package_download.html
@@ -40,9 +40,9 @@ <h2 class="h4">{% trans 'Results for document' %} <strong>{{ pid }}</strong></h2
         <table class="table table-bordered" id="table">
             <thead>
                 <tr>
-                    <th>{% trans 'Package' %}</th>
+                    <th>{% trans 'Version' %}</th>
+                    <th>{% trans 'Package name' %}</th>
                     <th>{% trans 'Creation date' %}</th>
-                    <th>{% trans 'Update date' %}</th>
                 </tr>
                 </thead>
                 <tbody id="resultSearchPackagesTableBody">
@@ -73,7 +73,7 @@ <h2 class="h4">{% trans 'Results for document' %} <strong>{{ pid }}</strong></h2
 
                 $('user-package-download-results').add(divSpinner);
 
-                if (result.data && 'doc_pkg' in result.data) {
+                if (result.data && 'doc_pkgs' in result.data) {
                     clearInterval(intervals[0]);
                     ingressPackageDownloadCreateTable(result.data);
                     ingressPackageDownloadToggleSpinner();
@@ -87,4 +87,4 @@ <h2 class="h4">{% trans 'Results for document' %} <strong>{{ pid }}</strong></h2
         ingressPackageDownloadToggleSpinner();
     }
 </script>
-{% endblock %}
+{% endblock %}