diff --git a/members/models.py b/members/models.py index fcaffeb..08550e1 100644 --- a/members/models.py +++ b/members/models.py @@ -103,7 +103,7 @@ class Member(BaseMember): latest = payments.latest('date') date = latest.date return date - except DoesNotExist: + except Payment.DoesNotExist: return None @staticmethod diff --git a/members/serializers.py b/members/serializers.py new file mode 100644 index 0000000..95f1e21 --- /dev/null +++ b/members/serializers.py @@ -0,0 +1,8 @@ +from rest_framework import serializers +from members.models import Member + +class MemberSerializer(serializers.ModelSerializer): + paid = serializers.DateTimeField(source='last_paid') + class Meta: + model = Member + fields = ('id', 'first_name', 'last_name', 'email', 'POR', 'AYY', 'jas', 'created', 'paid') diff --git a/members/static/css/members.css b/members/static/css/members.css index 5f560f5..29fcf9d 100644 --- a/members/static/css/members.css +++ b/members/static/css/members.css @@ -13,6 +13,10 @@ input { margin-bottom: 0.5rem; } +#header { + display: block; +} + #wrapper { padding-right: 0; padding-top: 0; @@ -24,6 +28,10 @@ input { background: #202020; top: 0; padding: 0; + -webkit-transition: width 0.01s height 0.01s linear; + -moz-transition: width 0.01s height 0.01s linear; + -o-transition: width 0.01s height 0.01s linear; + transition: width 0.01s, height 0.01s, transform 0.01s; } @@ -45,6 +53,10 @@ input { cursor: default; } +#sidebar-collapse { + display: none; +} + @media (max-width: 767px) { table { @@ -62,6 +74,18 @@ input { text-align: center; } + #header { + display: none; + } + + .sidebar-nav { + display: none; + } + + #sidebar-collapse { + display: block; + } + .logout-container { position: initial; margin-bottom: 1rem; @@ -212,4 +236,4 @@ input { width: 100%; max-width: 100%; height: 10rem !important; -} \ No newline at end of file +} diff --git a/members/templates/members_base.html b/members/templates/members_base.html index 8e25f67..d357b66 100644 --- a/members/templates/members_base.html +++ b/members/templates/members_base.html @@ -37,6 +37,16 @@