Merge pull request #318 from jabbate19/develop

Remove Freshman Project in Dashboard

Author: galenguyer

conditional/templates/dashboard.html

@@ -76,18 +76,6 @@ <h3 class="panel-title">Freshman Evaluations
                                 </span>
                             </td>
                         </tr>
-                        <tr>
-                            <td class="title">Freshman Project</td>
-                            <td>
-                                {% if freshman['fresh_proj'] == "Passed" %}
-                                <span class="pull-right"><span class="glyphicon glyphicon-ok-sign green"></span> Passed</span>
-                                {% elif freshman['fresh_proj'] == "Pending" %}
-                                <span class="pull-right"><span class="glyphicon glyphicon-hourglass yellow"></span> Pending</span>
-                                {% else %}
-                                <span class="pull-right"><span class="glyphicon glyphicon-remove-sign red"></span> Failed</span>
-                                {% endif %}
-                            </td>
-                        </tr>
                         </tbody>
                     </table>
                     <div class="panel-body" style="padding:0px 0px 8px 8px">

conditional/util/member.py

@@ -104,7 +104,6 @@ def get_freshman_data(user_name):
     freshman['hm_missed'] = len([h for h in h_meetings if h[1] == "Absent"])
     freshman['social_events'] = freshman_data.social_events
     freshman['general_comments'] = freshman_data.other_notes
-    freshman['fresh_proj'] = freshman_data.freshman_project
     freshman['sig_missed'] = freshman_data.signatures_missed
     freshman['eval_date'] = freshman_data.eval_date
     return freshman