Fixed type in db_mgmt, edited styling for voting on admin and user pages

ufsit · Apr 14, 2018 · 4a90698 · 4a90698
1 parent 4477dbf
commit 4a90698
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/api/db/db_mgmt.js b/api/db/db_mgmt.js
@@ -613,7 +613,7 @@ let db_mgmt_module = function () {
         get_resume_key: get_resume_key,
         record_resume_upload: record_resume_upload,
         get_resume_questions: get_resume_questions,
-        set_resume_questions: set_resume_questions
+        set_resume_questions: set_resume_questions,
         create_poll: create_poll,
         current_election: current_election,
         get_candidates: get_candidates,

diff --git a/src/app/admin/admin.component.html b/src/app/admin/admin.component.html
@@ -80,7 +80,7 @@ <h5>Create New Tile</h5>
       <br/>
 
       <h5 class="mb-3">Elections</h5>
-      <button class="btn btn-md btn-success" (click)="open(content)">Create new Poll</button>
+      <button *ngIf="!notifications.electionResults" class="btn btn-md btn-success" (click)="open(content)">Create new Poll</button>
       <button *ngIf="notifications.electionResults" class="btn btn-md btn-success" (click)="open(content2)">View Results of election</button>
 
       <!-- Warning before submitting poll -->

diff --git a/src/app/voting/voting.component.html b/src/app/voting/voting.component.html
@@ -41,7 +41,7 @@ <h4>It looks like you haven't met the membership requirement for voting &#9785;<
     <div class="row m-1 p-1">
       <div class="col center text-center">
         <h1 class="green_header">Voting</h1>
-        <p>Rank Candidates in the order for which you want them to win a position</p>
+        <p>Rank candidates in the order for which you want them to win a position (drag and drop)</p>
       </div>
     </div>
 
@@ -52,9 +52,10 @@ <h1 class="green_header">Voting</h1>
           <div class="card-header text-center border-secondary" style="background-color:#D0D0D0">
             <h4 class="mb-0" style="color:#303030">Presidential Candidates</h4>
           </div>
-          <div [sortablejs]="this.presidents" class="col-md-5">
+          <div [sortablejs]="this.presidents">
             <div *ngFor="let pres of presidents; let i = index">
-              {{pres.person}}
+              {{i + 1}}.  {{pres.person}} <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
+              <br><br>
             </div>
           </div>
         </div>
@@ -65,9 +66,10 @@ <h4 class="mb-0" style="color:#303030">Presidential Candidates</h4>
           <div class="card-header text-center border-secondary" style="background-color:#D0D0D0">
             <h4 class="mb-0" style="color:#303030">Vice Presidential Candidates</h4>
           </div>
-          <div [sortablejs]="this.vp" class="col-md-5">
-            <div *ngFor="let vp of this.vp">
-              {{vp.person}}
+          <div [sortablejs]="this.vp">
+            <div *ngFor="let vp of this.vp; let i = index">
+              {{i + 1}}. {{vp.person}}
+              <br><br>
             </div>
           </div>
         </div>
@@ -78,9 +80,10 @@ <h4 class="mb-0" style="color:#303030">Vice Presidential Candidates</h4>
           <div class="card-header text-center border-secondary" style="background-color:#D0D0D0">
             <h4 class="mb-0" style="color:#303030">Treasurer Candidates</h4>
           </div>
-          <div [sortablejs]="this.treasurers" class="col-md-5">
-            <div *ngFor="let treas of this.treasurers">
-              {{treas.person}}
+          <div [sortablejs]="this.treasurers">
+            <div *ngFor="let treas of this.treasurers; let i = index">
+              {{i + 1}}. {{treas.person}}
+              <br><br>
             </div>
           </div>
         </div>
@@ -91,9 +94,10 @@ <h4 class="mb-0" style="color:#303030">Treasurer Candidates</h4>
           <div class="card-header text-center border-secondary" style="background-color:#D0D0D0">
               <h4 class="mb-0" style="color:#303030">Secretary Candidates</h4>
           </div>
-          <div [sortablejs]="this.secretaries" class="col-md-5">
-            <div *ngFor="let secr of this.secretaries">
-              {{secr.person}}
+          <div [sortablejs]="this.secretaries">
+            <div *ngFor="let secr of this.secretaries; let i = index">
+              {{i + 1}}. {{secr.person}}
+              <br><br>
             </div>
           </div>
         </div>