Merge branch 'master' of github.com:nadineproject/nadine

Author: abkruse

staff/templates/staff/activity_list.html

@@ -28,7 +28,7 @@ <h2>Activity List</h2>
       </tr>
       {% for log in daily_logs %}
          <tr class="{% cycle 'row-even' 'row-odd' %}">
-            <td><a href="{% url 'staff_user_signins' log.user.username %}">{{ log.user.get_full_name }}</a></td>
+            <td><a href="{% url 'staff_activity_user' log.user.username %}">{{ log.user.get_full_name }}</a></td>
             <td><a href="{% url 'staff_activity_day' log.visit_date.year log.visit_date.month log.visit_date.day %}">{{ log.visit_date|date:"M d, Y" }}</td>
             <td>{{ log.payment }}</td>
             <td>{{ log.paid_by }}</td>

staff/templates/staff/member_detail.html

@@ -326,9 +326,9 @@ <h2>Active Guests:</h2>
 
                 {% for guest in user.profile.guests %}
                     <tr class="{% cycle 'row-even' 'row-odd' %}">
-                        <td nowrap><a href="{% url 'staff_user_detail' guest.user.username %}">{{ guest.user.get_full_name }}</a></td>
-                        <td>{{ guest.active_membership.membership_plan }}</td>
-                        <td style="text-align: center;">{{ guest.first_visit }}</td>
+                        <td nowrap><a href="{% url 'staff_user_detail' guest.username %}">{{ guest.get_full_name }}</a></td>
+                        <td>{{ guest.profile.active_membership.membership_plan }}</td>
+                        <td style="text-align: center;">{{ guest.profile.first_visit }}</td>
                     </tr>
                 {% endfor %}
             </table>

staff/urls.py

@@ -32,8 +32,8 @@
     url(r'^toggle_billing_flag/(?P<username>[^/]+)/$', billing.toggle_billing_flag, name='staff_toggle_bill'),
 
     url(r'^detail/(?P<username>[^/]+)/$', member.detail, name='staff_user_detail'),
-    url(r'^signins/(?P<username>[^/]+)/$', member.signins, name='staff_user_signins'),
-    url(r'^signins/json/(?P<username>[^/]+)/$', member.signins_json, name='staff_json_signins'),
+    # url(r'^signins/(?P<username>[^/]+)/$', member.signins, name='staff_user_signins'),
+    # url(r'^signins/json/(?P<username>[^/]+)/$', member.signins_json, name='staff_json_signins'),
     url(r'^transactions/(?P<username>[^/]+)/$', member.transactions, name='staff_user_transactions'),
     url(r'^bill/(?P<username>[^/]+)/$', member.bills, name='staff_user_bills'),
     url(r'^membership/(?P<username>[^/]+)/$', member.membership, name='staff_user_membership'),

staff/views/member.py

@@ -116,19 +116,19 @@ def bills(request, username):
     return render_to_response('staff/member_bills.html', {'user':user}, context_instance=RequestContext(request))
 
 
-@staff_member_required
-def signins(request, username):
-    user = get_object_or_404(User, username=username)
-    payment_types = ['Visit', 'Trial', 'Waive', 'Bill']
-    return render_to_response('staff/member_signins.html', {'payment_types': payment_types, 'user':user}, context_instance=RequestContext(request))
-
-
-@staff_member_required
-def signins_json(request, username):
-    user = get_object_or_404(User, username=username)
-    response_data = {}
-    response_data['coworkingdays'] = serializers.serialize('json', user.coworkingdays.all())
-    return HttpResponse(json.dumps(response_data), content_type="application/json")
+# @staff_member_required
+# def signins(request, username):
+#     user = get_object_or_404(User, username=username)
+#     payment_types = ['Visit', 'Trial', 'Waive', 'Bill']
+#     return render_to_response('staff/member_signins.html', {'payment_types': payment_types, 'user':user}, context_instance=RequestContext(request))
+#
+#
+# @staff_member_required
+# def signins_json(request, username):
+#     user = get_object_or_404(User, username=username)
+#     response_data = {}
+#     response_data['coworkingdays'] = serializers.serialize('json', user.coworkingdays.all())
+#     return HttpResponse(json.dumps(response_data), content_type="application/json")
 
 
 @staff_member_required