src/bornhack/urls.py

@@ -13,6 +13,7 @@ from info.views import CampInfoView
 from people.views import PeopleView
 from sponsors.views import SponsorsView
 from villages.views import (
+    VillageCreateView,
     VillageDeleteView,
     VillageDetailView,
     VillageListView,
@@ -117,6 +118,11 @@ urlpatterns = [
                     include(
                         [
                             path("", VillageListView.as_view(), name="village_list"),
+                            path(
+                                "create/",
+                                VillageCreateView.as_view(),
+                                name="village_create",
+                            ),
                             path(
                                 "<slug:slug>/delete/",
                                 VillageDeleteView.as_view(),

src/teams/models.py

@@ -401,7 +401,7 @@ class TeamShift(CampRelatedModel):
 
     shift_range = DateTimeRangeField()
 
-    team_members = models.ManyToManyField(TeamMember, blank=True, through=TeamShiftAssignment)
+    team_members = models.ManyToManyField(TeamMember, blank=True)
 
     people_required = models.IntegerField(default=1)
 
@@ -420,21 +420,3 @@ class TeamShift(CampRelatedModel):
     @property
     def users(self):
         return [member.user for member in self.team_members.all()]
-
-class TeamShiftAssignment(CampRelatedModel):
-    team_shift = models.ForeignKey(
-        "teams.TeamShift",
-        on_delete=models.CASCADE,
-        help_text="The shift",
-    )
-
-    team_member = models.ForeignKey(
-        "teams.TeamMember",
-        on_delete=models.CASCADE,
-        help_text="The team member on shift",
-    )
-
-    for_sale = models.BooleanField(
-        default=False,
-        help_text="Is the shift assignment for sale?",
-    )

src/teams/templates/team_shift_list.html

@@ -50,7 +50,7 @@ Shifts | {{ block.super }}
                 {{ shift.people_required }}
             <td>
                 {% for member in shift.team_members.all %}
-		{{ member.user.profile.get_public_credit_name }}{% if member.for_sale %} <em>(for sale!)</em>{% endif %}{% if not forloop.last %},{% endif %}
+		{{ member.user.profile.get_public_credit_name }}{% if not forloop.last %},{% endif %}
                 {% empty %}
                     None!
                 {% endfor %}
@@ -71,11 +71,7 @@ Shifts | {{ block.super }}
                    href="{% url 'teams:shift_member_drop' camp_slug=camp.slug team_slug=team.slug pk=shift.pk %}">
                     <i class="fas fa-thumbs-down"></i> Unassign me
                 </a>
-                <a class="btn btn-warning"
-                   href="{% url 'teams:shift_member_sell' camp_slug=camp.slug team_slug=team.slug pk=shift.pk %}">
-                    <i class="fas fa-thumbs-down"></i> Sell shift
-                </a>
-                {% elif shift.people_required > shift.team_members.filter(for_sale=False).count %}
+                {% elif shift.people_required > shift.team_members.count %}
                 <a class="btn btn-success"
                    href="{% url 'teams:shift_member_take' camp_slug=camp.slug team_slug=team.slug pk=shift.pk %}">
                     <i class="fas fa-thumbs-up"></i> Assign me

src/teams/templates/team_user_shifts.html

@@ -34,10 +34,6 @@ Your shifts | {{ block.super }}
         <td>
             {{ shift.shift_range.upper|date:'H:i' }}
         </td>
-	<td>
-          <a class="btn btn-warning"
-             href="{% url 'teams:shift_member_sell' camp_slug=camp.slug team_slug=shift.team.slug pk=shift.pk %}">
-              <i class="fas fa-thumbs-down"></i> Sell shift
         <td>
           <a class="btn btn-danger"
              href="{% url 'teams:shift_member_drop' camp_slug=camp.slug team_slug=shift.team.slug pk=shift.pk %}">
@@ -49,4 +45,4 @@ Your shifts | {{ block.super }}
     </tbody>
 </table>
 
-{% endblock %}
+{% endblock %}

src/teams/urls.py

@@ -179,11 +179,6 @@ urlpatterns = [
                                             MemberDropsShift.as_view(),
                                             name="shift_member_drop",
                                         ),
-                                        path(
-                                            "sell",
-                                            MemberSellsShift.as_view(),
-                                            name="shift_member_sell",
-                                        ),
                                     ]
                                 ),
                             ),

src/teams/views/shifts.py

@@ -274,9 +274,6 @@ class MemberTakesShift(LoginRequiredMixin, CampViewMixin, View):
                 request, template.render(Context({"shifts": overlapping_shifts}))
             )
         else:
-            # Remove at most one shift assignment for sale
-            for shift_assignment in shift.team_members.filter(for_sale=True)[:1]:
-                shift_assignment.delete()
             shift.team_members.add(team_member)
 
         kwargs.pop("pk")
@@ -300,23 +297,6 @@ class MemberDropsShift(LoginRequiredMixin, CampViewMixin, View):
 
         return HttpResponseRedirect(reverse("teams:shifts", kwargs=kwargs))
 
-class MemberSellsShift(LoginRequiredMixin, CampViewMixin, View):
-
-    http_methods = ["get"]
-
-    def get(self, request, **kwargs):
-        shift = TeamShift.objects.get(id=kwargs["pk"])
-        team = Team.objects.get(camp=self.camp, slug=kwargs["team_slug"])
-
-        team_member = TeamMember.objects.get(team=team, user=request.user)
-
-        shift_assignment = shift.team_members.get(team_member = team_member.pk)
-        shift_assignment.for_sale = True
-        shift_assignment.save()
-
-        kwargs.pop("pk")
-
-        return HttpResponseRedirect(reverse("teams:shifts", kwargs=kwargs))
 
 class UserShifts(CampViewMixin, TemplateView):
     template_name = "team_user_shifts.html"

src/villages/templates/village_list.html

@@ -16,6 +16,10 @@ Villages | {{ block.super }}
   tent, chairs and tables in the shop!
 </p>
 
+{% if user.is_authenticated and not camp.read_only %}
+<a href="{% url 'village_create' camp_slug=camp.slug %}" class="btn btn-primary">Create a new {{ camp.title }} village</a>
+{% endif %}
+
 <hr />
 {% if villages %}
 <table class="table table-hover table-condensed table-striped">

src/villages/urls.py

@@ -1,6 +1,7 @@
 from django.urls import path
 
 from .views import (
+    VillageCreateView,
     VillageDeleteView,
     VillageDetailView,
     VillageListView,
@@ -11,7 +12,7 @@ app_name = "villages"
 
 urlpatterns = [
     path("", VillageListView.as_view(), name="list"),
-    # path("create/", VillageCreateView.as_view(), name="create"),
+    path("create/", VillageCreateView.as_view(), name="create"),
     path("<slug:slug>/delete/", VillageDeleteView.as_view(), name="delete"),
     path("<slug:slug>/edit/", VillageUpdateView.as_view(), name="update"),
     path("<slug:slug>/", VillageDetailView.as_view(), name="detail"),