makes it clear to click on next stage

djaodjin · Jul 26, 2024 · b77a6e1 · b77a6e1
1 parent 8199210
commit b77a6e1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/djaopsp/static/js/assess-vue.js b/djaopsp/static/js/assess-vue.js
@@ -1170,14 +1170,27 @@ Vue.component('scorecard-requests', {
                         }
                         for( let gdx = 0; gdx < item.grantees.length;
                              ++gdx ) {
-                            // Implementation Note: We rely on the API
-                            // returning a list sorted by `created_at` here.
-                            if( item.created_at <
-                                vm.byCampaigns[campaign].last_completed_at ) {
-                                vm.byCampaigns[campaign].grantCandidates.push({
-                                    grantee: item.grantees[gdx],
-                                    last_shared_at: item.created_at
-                                });
+                            let found = false;
+                            for( let rdx = 0;
+                                 rdx < vm.byCampaigns[campaign].requests.length;
+                                 ++rdx ) {
+                                const request =
+                                      vm.byCampaigns[campaign].requests[rdx];
+                                if( request.grantee ===  item.grantees[gdx] ) {
+                                    found = true;
+                                    break;
+                                }
+                            }
+                            if( !found ) {
+                                // Implementation Note: We rely on the API
+                                // returning a list sorted by `created_at` here.
+                                if( item.created_at <
+                                  vm.byCampaigns[campaign].last_completed_at ) {
+                                 vm.byCampaigns[campaign].grantCandidates.push({
+                                     grantee: item.grantees[gdx],
+                                     last_shared_at: item.created_at
+                                 });
+                                }
                             }
                         }
                     }

diff --git a/djaopsp/templates/app/assess/_assess_left_sidebar.html b/djaopsp/templates/app/assess/_assess_left_sidebar.html
@@ -7,5 +7,5 @@
 {% endblock %}
 
 {% block left_sidebar_actions %}
-<a class="btn btn-primary w-100 mt-2" href="{{urls.improve}}">{% trans %}Planning{% endtrans %}</a>
+<a class="btn btn-primary w-100 mt-2" href="{{urls.improve}}">{% trans %}Next{% endtrans %} &raquo;</a>
 {% endblock %}
diff --git a/djaopsp/templates/app/improve/_improve_left_sidebar.html b/djaopsp/templates/app/improve/_improve_left_sidebar.html
@@ -1,5 +1,5 @@
 {% extends "app/_left_sidebar.html" %}
 
 {% block left_sidebar_actions %}
-<a class="btn btn-primary w-100 mt-2" href="{{urls.complete}}">{% trans %}Review{% endtrans %}</a>
+<a class="btn btn-primary w-100 mt-2" href="{{urls.complete}}">{% trans %}Next{% endtrans %} &raquo;</a>
 {% endblock %}
diff --git a/djaopsp/templates/app/share/index.html b/djaopsp/templates/app/share/index.html
@@ -6,7 +6,7 @@ <h1 class="text-center">Share {{campaign.title}}</h1>
   <h2 class="text-center">for {{profile.printable_name}}</h2>
   <div class="bg-body text-body px-2 py-4">
     <div class="row">
-      <div class="col-8">
+      <div class="col-md-8">
         {% if not sample.is_frozen %}
         <div class="alert alert-warning">
           <div>
@@ -324,7 +324,7 @@ <h2 class="text-center">for {{profile.printable_name}}</h2>
             </div>
           </portfolios-grant-list>
         </div>{# /.grants #}
-      </div>{# /.col-8 #}
+      </div>{# /.col-md-8 #}
       {% endif %}
     </div>
   </div>