Changes to corresponding voting files

BriaW · BriaW · commit 97c9babf4663 · 2019-12-17T16:18:12.000-05:00
diff --git a/api/API/voting.py b/api/API/voting.py
@@ -12,14 +12,9 @@ def getVotesByProject(proj):
                 #   .over(partition_by=[Voting.projectID]),
                 fn.Avg(Voting.qualityOfResearch),
                 #   .over(partition_by=[Voting.projectID]),
-                fn.Avg(Voting.studentDevelopment),
-                #   .over(partition_by=[Voting.projectID]),
-                fn.Avg(Voting.facultyDevelopment),
+                fn.Avg(Voting.development),
                 #   .over(partition_by=[Voting.projectID]),
                 fn.Avg(Voting.collaborative),
-                fn.Avg(Voting.interaction),
-                fn.Avg(Voting.communication),
-                fn.Avg(Voting.scholarlySignificance),
                 fn.Avg(Voting.proposalQuality),
                 fn.Avg(Voting.budget),
                 fn.Avg(Voting.timeline)
@@ -36,24 +31,24 @@ def getVotesByProject(proj):
 
 
 def getVotes():
-   
+
    paramsQ = (Voting.select())
-   
+
    app.logger.info("Looking for votes with query:\n\n" + paramsQ + "\n\n")
-   
+
    if paramsQ.exists():
       return paramsQ.get()
    else:
       return None
 
 def getCommitteeVotes(committee):
-   
+
    paramsQ = (Voting.select()
                     .where(Voting.committeeID == committee)
               )
-   
+
    app.logger.info("Looking for votes with query:\n\n" + paramsQ + "\n\n")
-   
+
    if paramsQ.exists():
       return paramsQ.execute()
    else:
@@ -66,23 +61,22 @@ def getVote(username, pid):
                     .where(Voting.projectID == pid)
             )
   app.logger.info("Looking for {0}'s votes for project {1}\n".format(username, pid))
-  
+
   if paramsQ.exists():
     return paramsQ.get()
   else:
     return None
-    
+
 # def getVote(committee, project):
-   
+
 #   paramsQ = (Voting.select()
 #                     .where(Voting.committeeID == committee and
 #                           Voting.projectID == project)
 #               )
-   
+
 #   app.logger.info("Looking for votes with query:\n\n" + paramsQ + "\n\n")
-   
+
 #   if paramsQ.exists():
 #       return paramsQ.get()
 #   else:
 #       return None
-
diff --git a/api/committee/vote.py b/api/committee/vote.py
@@ -18,7 +18,7 @@ def vote_GET (username):
   programs = getAllPrograms()
   budget = getAllBudgets()
   # votes = getVotes()
-  
+
   for p in project:
     if (Voting.select()
               .where(Voting.projectID == p.pID)
@@ -27,13 +27,13 @@ def vote_GET (username):
       votes = getVote(username, p)
     else:
       votes = Voting.create(committeeID = username, projectID = p.pID)
-  
+
   theirVotes = getCommitteeVotes(username)
   outVotes = []
   if theirVotes is not None:
     for vote in theirVotes:
       outVotes.append(vote)
-    
+
   return render_template (  "committee/vote.html",
                             proj = project,
                             username = username,
@@ -48,26 +48,26 @@ def vote_GET (username):
 def vote_POST (username):
   if username != authUser(request.environ):
     return { "response": cfg["response"]["badUsername"] }
-  
+
   data = request.form
 
   print "Data is: " + str(data)
-  
-  # TODO: Need to test if row exists to update votes OR create a new row; 
+
+  # TODO: Need to test if row exists to update votes OR create a new row;
   # currently always writes to the first row, and in random order (based on dictionary order)
   for key, value in data.iteritems():
     projectAndColumn = key.split("-")
     votes = getCommitteeVotes(username)
-    
-    print projectAndColumn  
-    
+
+    print projectAndColumn
+
     if (Voting.select()
               .where(Voting.projectID == projectAndColumn[0]).exists()
        ):
       votes = getVote(username, projectAndColumn[0])
     else:
       votes = Voting.create(committeeID = username, projectID = projectAndColumn[0])
-      
+
     # print "Key " + key
     # print "Value " + value
     print votes.projectID
@@ -77,7 +77,7 @@ def vote_POST (username):
     votes.studentRoleVote     = (value if projectAndColumn[1] == "studentRoleVote" else votes.studentRoleVote)
     votes.feasibilityVote     = (value if projectAndColumn[1] == "feasibilityVote" else votes.feasibilityVote)
     votes.save()
-  
+
   theirVotes = getCommitteeVotes(username)
   outVotes = []
   for vote in theirVotes:
@@ -91,4 +91,3 @@ def vote_POST (username):
                             fac = faculty,
                             votes = outVotes
                           )
-  
diff --git a/api/config.yaml b/api/config.yaml
@@ -203,6 +203,45 @@ voting:
     dbName: "timeline"
     longDescription: "There is a high probability that the proposed project will be completed within the time frame specified."
 
+```
+ - title: "Likelihood of Enhancing Student Learning"
+    dbName: "studentLearning"
+    longDescription: "Enhances students' learning by providing opportunities for the engagement of challenging, collaborative and directed projects in an apprentice-mentor relationship with faculty."
+  - title: "Accessibility of Research to Students"
+    dbName: "studentAccessibility"
+    longDescription: "The project topic/material is accessible to students, allowing them to play a central role in carrying out, interpreting, and presenting the research."
+  - title: "Professional Quality of Research"
+    dbName: "qualityOfResearch"
+    longDescription: "The project itself, not the work expected from students, should be at a level expected of faculty professionals, which allows the faculty mentor to provide a model for engaging research and creative activity."
+  - title: "Potential for Career and Personal Development (Student)"
+    dbName: "studentDevelopment"
+    longDescription: "Offers experiences that allow students to build their self-confidence to pursue careers and make informed career and graduate school decisions for further study beyond Berea."
+  - title: "Potential for Career and Personal Development (Faculty)"
+    dbName: "facultyDevelopment"
+    longDescription: "Offers experiences that allow faculty to strengthen their own professional development and growth."
+  - title: "Collaborative Nature of Project"
+    dbName: "collaborative"
+    longDescription: "Helps students understand the critical interplay between collaboration and independent thought and action in any team effort to engage a complex, open-ended project."
+  - title: "Level of Expected Student-Faculty Interaction"
+    dbName: "interaction"
+    longDescription: "Fosters significant student-faculty interaction in scholarly/creative work."
+  - title: "Likelihood of Enhancing Communication Skills"
+    dbName: "communication"
+    longDescription: "Enhances students' communication skills by participating in a significant way in the writing of a final summary or paper reporting the methods used and interpreting the reults/conclusions of the study/project."
+  - title: "Scholarly/Creative Significance"
+    dbName: "scholarlySignificance"
+    longDescription: "Proposal contains adequate background information establishing possible contributions of the faculty/student research to the current body of knowledge in the area of interest."
+  - title: "Clarity/Quality of Proposal"
+    dbName: "proposalQuality"
+    longDescription: "Proposal is written in clear and concise language that is understandable by colleagues outside the discipline. Overall appearance of the proposal is professional and complete."
+  - title: "Budget (Appropriateness and Justification)"
+    dbName: "budget"
+    longDescription: "Budget is realistic, as well as justified by and consistent with the scope of the proposed project."
+  - title: "Timeline"
+    dbName: "timeline"
+    longDescription: "There is a high probability that the proposed project will be completed within the time frame specified."
+
+  ```
 
 # I think this should move to the Parameters table, so it can be more easily configured in the UI by the committee.
 
diff --git a/api/models.py b/api/models.py
@@ -162,12 +162,8 @@ class Voting (DynamicModel):
   studentLearning       = FloatField(null = True)
   studentAccessibility  = FloatField(null = True)
   qualityOfResearch     = FloatField(null = True)
-  studentDevelopment    = FloatField(null = True)
-  facultyDevelopment    = FloatField(null = True)
+  development           = FloatField(null = True)
   collaborative         = FloatField(null = True)
-  interaction           = FloatField(null = True)
-  communication         = FloatField(null = True)
-  scholarlySignificance = FloatField(null = True)
   proposalQuality       = FloatField(null = True)
   budget                = FloatField(null = True)
   timeline              = FloatField(null = True)
diff --git a/api/static/js/pages/allVotes.js b/api/static/js/pages/allVotes.js
@@ -8,12 +8,12 @@ function recalculate () {
       // console.log(parseFloat(this.innerHTML));
       sum += (parseFloat(this.innerHTML));
       console.log("Sum " + sum);
-      $("#average" + idx).html(parseFloat(sum/12).toFixed(2)); //Five 
+      $("#average" + idx).html(parseFloat(sum/7).toFixed(2)); //7 is the number of criteria in the rubric
     });
   };
 };
 
 $(document).ready(function(){
-  // $('[data-toggle="tooltip"]').tooltip(); 
+  // $('[data-toggle="tooltip"]').tooltip();
   recalculate();
 });
diff --git a/api/static/js/pages/vote.js b/api/static/js/pages/vote.js
@@ -6,7 +6,7 @@ function recalculate () {
     var rows = $("#row" + idx).find("select.rowValue");
     rows.each(function (value, i) {
         sum += (this.options.selectedIndex);
-        $("#average" + idx).html(sum/3);    //Five
+        $("#average" + idx).html(sum/3);   //3 is the number of ratings that each criteria has (Exceptional, Good, Needs Improvement)
     });
   };
 };
