fix #86,#87

BD-IATI · Dec 5, 2016 · 8180f89 · 8180f89
1 parent 8547c8d
commit 8180f89
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/AIMS_BD_IATI.DAL/AimsDAL.cs b/AIMS_BD_IATI.DAL/AimsDAL.cs
@@ -1121,6 +1121,7 @@ join fundSource in dbContext.tblFundSources on project.FundSourceId equals fundS
                             let isIATIactivity = project.IatiIdentifier != null || project.IatiIdentifier.Length > 0 || project.DPProjectNo != null || project.DPProjectNo.Length > 0
                             where fundSource.IATICode == dp
                             && isIATIactivity
+                            orderby project.Title
                             select project);
 
             List<iatiactivity> iatiactivities = new List<iatiactivity>();
@@ -1144,6 +1145,7 @@ join fundSource in dbContext.tblFundSources on project.FundSourceId equals fundS
                             let isNotMapped = !mappedProjectIds.Contains(project.Id)
                             where fundSource.IATICode == dp
                             && isIATIactivity && isNotMapped
+                            orderby project.Title
                             select project);
 
             List<iatiactivity> iatiactivities = new List<iatiactivity>();
@@ -1166,6 +1168,7 @@ join fundSource in dbContext.tblFundSources on project.FundSourceId equals fundS
                             let isMapped = mappedProjectIds.Contains(project.Id)
                             where fundSource.IATICode == dp
                             && isIATIactivity && isMapped
+                            orderby project.Title
                             select project);
 
             List<iatiactivity> iatiactivities = new List<iatiactivity>();

diff --git a/AIMS_BD_IATI.website/Modules/IATIImport/3FilterDP/3FilterDPView.html b/AIMS_BD_IATI.website/Modules/IATIImport/3FilterDP/3FilterDPView.html
@@ -182,16 +182,15 @@ <h3>Determine Managing DP</h3>
                                 <span ng-hide="RelevantActivities.length == 0">
                                     <button ng-click="GotoTab(0)" class="btn btn-default">Back</button>
 
-                                    <button ng-show="hasOtherDPsProject"
-                                            type="button"
+                                    <a tabindex="0" ng-show="hasOtherDPsProject"
                                             class="btn btn-primary"
                                             popover-title="Delegate projects to other DPs?"
                                             uib-popover-template="'myPopoverTemplate.html'"
                                             popover-append-to-body="true"
                                             popover-trigger="focus"
                                             popover-placement="auto">
                                         Next...
-                                    </button>
+                                    </a>
 
                                     <a id="btn4Projects" ng-hide='hasOtherDPsProject' class="btn btn-primary" ng-href="#/4Projects">Next</a>
                                 </span>

diff --git a/AIMS_BD_IATI.website/Modules/IATIImport/6GeneralPreferences/6GeneralPreferencesView.html b/AIMS_BD_IATI.website/Modules/IATIImport/6GeneralPreferences/6GeneralPreferencesView.html
@@ -31,14 +31,14 @@ <h2>
         <div class="col-md-12 btnFooter">
             <!--<a class="btn btn-default" ng-href="#/5Match">Back</a>-->
             <a class="btn btn-default" ng-href="#/4Projects">Back</a>
-            <button type="button"
+            <a tabindex="0"
                     class="btn btn-primary"
                     popover-title="Save Preferences"
                     uib-popover-template="'myPopoverTemplate.html'"
                     popover-append-to-body="true"
                     popover-placement="auto">
                 Next...
-            </button>
+            </a>
             <a hidden id="btn7ReviewAdjustment" ng-href="#/7ReviewAdjustment">Next</a>
         </div>
     </div>