Fixing form design a little#922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
karbassi wants to merge 2 commits into from
Closed

Fixing form design a little #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f1c4bf
Fixing form design a little
karbassi Jun 4, 2022
b59ca84
Update wording on parent intake form.
karbassi Jun 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 29 additions & 27 deletions accounts/templates/account/guardian/home.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,37 +5,16 @@

{% block contained_content %}

<section class="margin-top-3">
<h2 class="title text-primary">Your Profile</h2>
<p>Joined on {{ guardian.user.date_joined|naturalday|capfirst }}</p>

<form id="profile_form" enctype="multipart/form-data" action="" method="post">
{% csrf_token %}
<div class="grid-x grid-margin-x">
<div class="cell medium-6">{% bootstrap_field user_form.first_name %}</div>
<div class="cell medium-6">{% bootstrap_field user_form.last_name %}</div>
<div class="cell medium-6">{% bootstrap_field form.phone %}</div>
<div class="cell medium-6">{% bootstrap_field form.zip %}</div>
<div class="cell medium-6">{% bootstrap_field form.birthday %}</div>
<div class="cell medium-6">{% bootstrap_field form.gender %}</div>
<div class="cell medium-6">{% bootstrap_field form.race_ethnicity %}</div>
</div>
{% buttons %}
<button type="submit" class="button">Save</button>
{% endbuttons %}
</form>
</section>

<section class="margin-top-3">
<h2 class="title text-tertiary">Students</h2>
{% if students %}
<table class="students table table-striped">
<table class="students">
<thead>
<tr class="text-muted">
<th>Name</th>
<th class="hidden-xs">Age</th>
<th class="hidden-xs">Medical Conditions</th>
<th class="hidden-xs">Medications</th>
<!-- <th class="hidden-xs">Medical Conditions</th> -->
<!-- <th class="hidden-xs">Medications</th> -->
<th></th>
</tr>
</thead>
Expand All@@ -44,9 +23,9 @@ <h2 class="title text-tertiary">Students</h2>
<tr>
<td>{{ student.full_name }}</td>
<td class="hidden-xs">{{ student.get_age }}</td>
<td class="hidden-xs">{% if student.medical_conditions %}Yes{% else %}No{% endif %}</td>
<td class="hidden-xs">{% if student.medications %}Yes{% else %}No{% endif %}</td>
<td><a href="{% url 'student-detail' student.id %}" class="button small">Edit Info</a></td>
<!-- <td class="hidden-xs">{% if student.medical_conditions %}Yes{% else %}No{% endif %}</td> -->
<!-- <td class="hidden-xs">{% if student.medications %}Yes{% else %}No{% endif %}</td> -->
<td class="text-right"><a href="{% url 'student-detail' student.id %}" class="button ">Edit Info</a></td>
</tr>
{% endfor %}
</tbody>
Expand All@@ -57,6 +36,29 @@ <h2 class="title text-tertiary">Students</h2>
{% endif %}
</section>

<section class="margin-top-3">
<h2 class="title text-primary">Your Profile</h2>
<p>Joined on {{ guardian.user.date_joined|naturalday|capfirst }}</p>

<form id="profile_form" enctype="multipart/form-data" action="" method="post">
{% csrf_token %}
<div class="grid-x grid-margin-x">
<div class="cell medium-6">{% bootstrap_field user_form.first_name %}</div>
<div class="cell medium-6">{% bootstrap_field user_form.last_name %}</div>
<div class="cell medium-6">{% bootstrap_field form.phone %}</div>
<div class="cell medium-6">{% bootstrap_field form.zip %}</div>
<div class="cell medium-6">{% bootstrap_field form.birthday %}</div>
<div class="cell medium-6">{% bootstrap_field form.gender %}</div>
<div class="cell medium-6">{% bootstrap_field form.race_ethnicity %}</div>
</div>
{% buttons %}
<button type="submit" class="button">Save</button>
{% endbuttons %}
</form>
</section>



<section class="margin-top-3">
<h2 class="title text-secondary">Upcoming Classes</h2>

Expand Down
246 changes: 152 additions & 94 deletions accounts/views.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,17 +41,24 @@ class LoginView(MetadataMixin, AllAuthLoginView):


@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
class GuardianAccountHomeView(MetadataMixin, TemplateView):
template_name = "account/guardian/home.html"
title = "My Account | We All Code"

def dispatch(self, *args, **kwargs):
if not self.request.user.role:
guardian = get_object_or_404(Guardian, user=self.request.user)
students = Student.objects.filter(
is_active=True,
guardian=guardian,
).exists()

if students == False:
if "next" in self.request.GET:
return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
else:
messages.warning(
messages.error(
self.request,
"Tell us a little about yourself before going on account.",
"Please add at least one student to your account.",
)
return redirect("welcome")

Expand All@@ -67,62 +74,11 @@ def get_context_data(self, **kwargs):

context["user"] = self.request.user

if self.request.user.role == "mentor":
return {**context, **self.get_context_data_for_mentor()}

if self.request.user.role == "guardian":
return {**context, **self.get_context_data_for_guardian()}

return context

def get_context_data_for_mentor(self):
mentor = get_object_or_404(Mentor, user=self.request.user)

orders = MentorOrder.objects.select_related().filter(
is_active=True,
mentor=mentor,
guardian = get_object_or_404(
Guardian,
user=self.request.user,
)

upcoming_sessions = orders.filter(is_active=True, session__start_date__gte=timezone.now()).order_by(
"session__start_date"
)

past_sessions = orders.filter(is_active=True, session__start_date__lte=timezone.now()).order_by(
"session__start_date"
)

meeting_orders = MeetingOrder.objects.select_related().filter(mentor=mentor)

upcoming_meetings = meeting_orders.filter(
is_active=True,
meeting__is_public=True,
meeting__end_date__gte=timezone.now(),
).order_by("meeting__start_date")

account_complete = False

if (
mentor.first_name
and mentor.last_name
and mentor.avatar
and mentor.background_check
and past_sessions.count() > 0
):
account_complete = True

return {
"mentor": mentor,
"orders": orders,
"upcoming_sessions": upcoming_sessions,
"past_sessions": past_sessions,
"meeting_orders": meeting_orders,
"upcoming_meetings": upcoming_meetings,
"account_complete": account_complete,
}

def get_context_data_for_guardian(self):
guardian = get_object_or_404(Guardian, user=self.request.user)

students = Student.objects.filter(
is_active=True,
guardian=guardian,
Expand All@@ -142,30 +98,20 @@ def get_context_data_for_guardian(self):
session__start_date__lte=timezone.now(),
).order_by("session__start_date")

return {
"guardian": guardian,
"students": students,
"student_orders": student_orders,
"upcoming_orders": upcoming_orders,
"past_orders": past_orders,
context = {
**context,
**{
"guardian": guardian,
"students": students,
"student_orders": student_orders,
"upcoming_orders": upcoming_orders,
"past_orders": past_orders,
},
}

def get(self, *args, **kwargs):
if self.request.user.role == "mentor":
return self.get_for_mentor(**kwargs)

if self.request.user.role == "guardian":
return self.get_for_guardian(**kwargs)

def get_for_mentor(self, **kwargs):
context = self.get_context_data(**kwargs)

context["form"] = MentorForm(instance=context["mentor"])
context["user_form"] = CDCModelForm(instance=context["mentor"].user)

return render(self.request, "account/mentor/home.html", context)
return context

def get_for_guardian(self, **kwargs):
def get(self, *args, **kwargs):
context = self.get_context_data(**kwargs)

context["form"] = GuardianForm(instance=context["guardian"])
Expand All@@ -174,20 +120,19 @@ def get_for_guardian(self, **kwargs):
return render(self.request, "account/guardian/home.html", context)

def post(self, *args, **kwargs):
if self.request.user.role == "mentor":
return self.post_for_mentor(**kwargs)

if self.request.user.role == "guardian":
return self.post_for_guardian(**kwargs)

def post_for_mentor(self, **kwargs):
context = self.get_context_data(**kwargs)

mentor = context["mentor"]
guardian = context["guardian"]

form = MentorForm(self.request.POST, self.request.FILES, instance=mentor)
form = GuardianForm(
self.request.POST,
instance=guardian,
)

user_form = CDCModelForm(self.request.POST, self.request.FILES, instance=mentor.user)
user_form = CDCModelForm(
self.request.POST,
instance=guardian.user,
)

if form.is_valid() and user_form.is_valid():
form.save()
Expand All@@ -202,16 +147,105 @@ def post_for_mentor(self, **kwargs):
context["form"] = form
context["user_form"] = user_form

return render(self.request, "account/guardian/home.html", context)


@method_decorator(login_required, name="dispatch")
class MentorAccountHomeView(MetadataMixin, TemplateView):
template_name = "account/mentor/home.html"
title = "My Account | We All Code"

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)

if "highlight" in self.request.GET:
context["highlight"] = self.request.GET["highlight"]
else:
context["highlight"] = False

context["user"] = self.request.user

mentor = get_object_or_404(
Mentor,
user=self.request.user,
)

orders = MentorOrder.objects.select_related().filter(
is_active=True,
mentor=mentor,
)

upcoming_sessions = orders.filter(
is_active=True,
session__start_date__gte=timezone.now(),
).order_by("session__start_date")

past_sessions = orders.filter(
is_active=True,
session__start_date__lte=timezone.now(),
).order_by("session__start_date")

meeting_orders = MeetingOrder.objects.select_related().filter(
mentor=mentor,
)

upcoming_meetings = meeting_orders.filter(
is_active=True,
meeting__is_public=True,
meeting__end_date__gte=timezone.now(),
).order_by(
"meeting__start_date",
)

account_complete = False

if (
mentor.first_name
and mentor.last_name
and mentor.avatar
and mentor.background_check
and past_sessions.count() > 0
):
account_complete = True

context = {
**context,
**{
"mentor": mentor,
"orders": orders,
"upcoming_sessions": upcoming_sessions,
"past_sessions": past_sessions,
"meeting_orders": meeting_orders,
"upcoming_meetings": upcoming_meetings,
"account_complete": account_complete,
},
}
return context

def get(self, *args, **kwargs):
context = self.get_context_data(**kwargs)

context["form"] = MentorForm(instance=context["mentor"])
context["user_form"] = CDCModelForm(instance=context["mentor"].user)

return render(self.request, "account/mentor/home.html", context)

def post_for_guardian(self, **kwargs):
def post(self, *args, **kwargs):
context = self.get_context_data(**kwargs)

guardian = context["guardian"]
mentor = context["mentor"]

form = GuardianForm(self.request.POST, instance=guardian)
form = MentorForm(
self.request.POST,
self.request.FILES,
instance=mentor,
)

user_form = CDCModelForm(self.request.POST, instance=guardian.user)
user_form = CDCModelForm(
self.request.POST,
self.request.FILES,
instance=mentor.user,
)

if form.is_valid() and user_form.is_valid():
form.save()
Expand All@@ -226,4 +260,28 @@ def post_for_guardian(self, **kwargs):
context["form"] = form
context["user_form"] = user_form

return render(self.request, "account/guardian/home.html", context)
return render(self.request, "account/mentor/home.html", context)


@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
title = "My Account | We All Code"

def dispatch(self, *args, **kwargs):
if not self.request.user.role:
if "next" in self.request.GET:
return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
else:
messages.warning(
self.request,
"Tell us a little about yourself before going on account.",
)
return redirect("welcome")

if self.request.user.role == "guardian":
return GuardianAccountHomeView.as_view()(self.request)

if self.request.user.role == "mentor":
return MentorAccountHomeView.as_view()(self.request)

return super().dispatch(*args, **kwargs)
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fixing form design a little#922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

karbassi
wants to merge
2
commits into

from

 Closed


Fixing form design a little
#922
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4f1c4bf

Fixing form design a little


karbassi Jun 4, 2022
b59ca84

Update wording on parent intake form.


karbassi Jun 6, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 29 additions & 27 deletions
accounts/templates/account/guardian/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,37 +5,16 @@

{% block contained_content %}

<section class="margin-top-3">
 <h2 class="title text-primary">Your Profile</h2>
 <p>Joined on {{ guardian.user.date_joined|naturalday|capfirst }}</p>

 <form id="profile_form" enctype="multipart/form-data" action="" method="post">
 {% csrf_token %}
 <div class="grid-x grid-margin-x">
 <div class="cell medium-6">{% bootstrap_field user_form.first_name %}</div>
 <div class="cell medium-6">{% bootstrap_field user_form.last_name %}</div>
 <div class="cell medium-6">{% bootstrap_field form.phone %}</div>
 <div class="cell medium-6">{% bootstrap_field form.zip %}</div>
 <div class="cell medium-6">{% bootstrap_field form.birthday %}</div>
 <div class="cell medium-6">{% bootstrap_field form.gender %}</div>
 <div class="cell medium-6">{% bootstrap_field form.race_ethnicity %}</div>
 </div>
 {% buttons %}
 <button type="submit" class="button">Save</button>
 {% endbuttons %}
 </form>
</section>

<section class="margin-top-3">
 <h2 class="title text-tertiary">Students</h2>
 {% if students %}
 <table class="students table table-striped">
 <table class="students">
 <thead>
 <tr class="text-muted">
 <th>Name</th>
 <th class="hidden-xs">Age</th>
 <th class="hidden-xs">Medical Conditions</th>
 <th class="hidden-xs">Medications</th>
 <!-- <th class="hidden-xs">Medical Conditions</th> -->
 <!-- <th class="hidden-xs">Medications</th> -->
 <th></th>
 </tr>
 </thead>
Expand All@@ -44,9 +23,9 @@ <h2 class="title text-tertiary">Students</h2>
 <tr>
 <td>{{ student.full_name }}</td>
 <td class="hidden-xs">{{ student.get_age }}</td>
 <td class="hidden-xs">{% if student.medical_conditions %}Yes{% else %}No{% endif %}</td>
 <td class="hidden-xs">{% if student.medications %}Yes{% else %}No{% endif %}</td>
 <td><a href="{% url 'student-detail' student.id %}" class="button small">Edit Info</a></td>
 <!-- <td class="hidden-xs">{% if student.medical_conditions %}Yes{% else %}No{% endif %}</td> -->
 <!-- <td class="hidden-xs">{% if student.medications %}Yes{% else %}No{% endif %}</td> -->
 <td class="text-right"><a href="{% url 'student-detail' student.id %}" class="button ">Edit Info</a></td>
 </tr>
 {% endfor %}
 </tbody>
Expand All@@ -57,6 +36,29 @@ <h2 class="title text-tertiary">Students</h2>
 {% endif %}
</section>

<section class="margin-top-3">
 <h2 class="title text-primary">Your Profile</h2>
 <p>Joined on {{ guardian.user.date_joined|naturalday|capfirst }}</p>

 <form id="profile_form" enctype="multipart/form-data" action="" method="post">
 {% csrf_token %}
 <div class="grid-x grid-margin-x">
 <div class="cell medium-6">{% bootstrap_field user_form.first_name %}</div>
 <div class="cell medium-6">{% bootstrap_field user_form.last_name %}</div>
 <div class="cell medium-6">{% bootstrap_field form.phone %}</div>
 <div class="cell medium-6">{% bootstrap_field form.zip %}</div>
 <div class="cell medium-6">{% bootstrap_field form.birthday %}</div>
 <div class="cell medium-6">{% bootstrap_field form.gender %}</div>
 <div class="cell medium-6">{% bootstrap_field form.race_ethnicity %}</div>
 </div>
 {% buttons %}
 <button type="submit" class="button">Save</button>
 {% endbuttons %}
 </form>
</section>



<section class="margin-top-3">
 <h2 class="title text-secondary">Upcoming Classes</h2>

Expand Down

246 changes: 152 additions & 94 deletions
accounts/views.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,17 +41,24 @@ class LoginView(MetadataMixin, AllAuthLoginView):


@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
class GuardianAccountHomeView(MetadataMixin, TemplateView):
 template_name = "account/guardian/home.html"
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 guardian = get_object_or_404(Guardian, user=self.request.user)
 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
 ).exists()

 if students == False:
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 messages.error(
 self.request,
 "Tell us a little about yourself before going on account.",
 "Please add at least one student to your account.",
 )
 return redirect("welcome")

Expand All@@ -67,62 +74,11 @@ def get_context_data(self, **kwargs):

 context["user"] = self.request.user

 if self.request.user.role == "mentor":
 return {**context, **self.get_context_data_for_mentor()}

 if self.request.user.role == "guardian":
 return {**context, **self.get_context_data_for_guardian()}

 return context

 def get_context_data_for_mentor(self):
 mentor = get_object_or_404(Mentor, user=self.request.user)

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 guardian = get_object_or_404(
 Guardian,
 user=self.request.user,
 )

 upcoming_sessions = orders.filter(is_active=True, session__start_date__gte=timezone.now()).order_by(
 "session__start_date"
 )

 past_sessions = orders.filter(is_active=True, session__start_date__lte=timezone.now()).order_by(
 "session__start_date"
 )

 meeting_orders = MeetingOrder.objects.select_related().filter(mentor=mentor)

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now(),
 ).order_by("meeting__start_date")

 account_complete = False

 if (
 mentor.first_name
 and mentor.last_name
 and mentor.avatar
 and mentor.background_check
 and past_sessions.count() > 0
 ):
 account_complete = True

 return {
 "mentor": mentor,
 "orders": orders,
 "upcoming_sessions": upcoming_sessions,
 "past_sessions": past_sessions,
 "meeting_orders": meeting_orders,
 "upcoming_meetings": upcoming_meetings,
 "account_complete": account_complete,
 }

 def get_context_data_for_guardian(self):
 guardian = get_object_or_404(Guardian, user=self.request.user)

 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
Expand All@@ -142,30 +98,20 @@ def get_context_data_for_guardian(self):
 session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 return {
 "guardian": guardian,
 "students": students,
 "student_orders": student_orders,
 "upcoming_orders": upcoming_orders,
 "past_orders": past_orders,
 context = {
 **context,
 **{
 "guardian": guardian,
 "students": students,
 "student_orders": student_orders,
 "upcoming_orders": upcoming_orders,
 "past_orders": past_orders,
 },
 }

 def get(self, *args, **kwargs):
 if self.request.user.role == "mentor":
 return self.get_for_mentor(**kwargs)

 if self.request.user.role == "guardian":
 return self.get_for_guardian(**kwargs)

 def get_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, "account/mentor/home.html", context)
 return context

 def get_for_guardian(self, **kwargs):
 def get(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = GuardianForm(instance=context["guardian"])
Expand All@@ -174,20 +120,19 @@ def get_for_guardian(self, **kwargs):
 return render(self.request, "account/guardian/home.html", context)

 def post(self, *args, **kwargs):
 if self.request.user.role == "mentor":
 return self.post_for_mentor(**kwargs)

 if self.request.user.role == "guardian":
 return self.post_for_guardian(**kwargs)

 def post_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

mentor = context["mentor"]
guardian = context["guardian"]

 form = MentorForm(self.request.POST, self.request.FILES, instance=mentor)
 form = GuardianForm(
 self.request.POST,
 instance=guardian,
 )

 user_form = CDCModelForm(self.request.POST, self.request.FILES, instance=mentor.user)
 user_form = CDCModelForm(
 self.request.POST,
 instance=guardian.user,
 )

 if form.is_valid() and user_form.is_valid():
 form.save()
Expand All@@ -202,16 +147,105 @@ def post_for_mentor(self, **kwargs):
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, "account/guardian/home.html", context)


@method_decorator(login_required, name="dispatch")
class MentorAccountHomeView(MetadataMixin, TemplateView):
 template_name = "account/mentor/home.html"
 title = "My Account | We All Code"

 def get_context_data(self, **kwargs):
 context = super().get_context_data(**kwargs)

 if "highlight" in self.request.GET:
 context["highlight"] = self.request.GET["highlight"]
 else:
 context["highlight"] = False

 context["user"] = self.request.user

 mentor = get_object_or_404(
 Mentor,
 user=self.request.user,
 )

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 )

 upcoming_sessions = orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now(),
 ).order_by("session__start_date")

 past_sessions = orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 meeting_orders = MeetingOrder.objects.select_related().filter(
 mentor=mentor,
 )

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now(),
 ).order_by(
 "meeting__start_date",
 )

 account_complete = False

 if (
 mentor.first_name
 and mentor.last_name
 and mentor.avatar
 and mentor.background_check
 and past_sessions.count() > 0
 ):
 account_complete = True

 context = {
 **context,
 **{
 "mentor": mentor,
 "orders": orders,
 "upcoming_sessions": upcoming_sessions,
 "past_sessions": past_sessions,
 "meeting_orders": meeting_orders,
 "upcoming_meetings": upcoming_meetings,
 "account_complete": account_complete,
 },
 }
 return context

 def get(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, "account/mentor/home.html", context)

 def post_for_guardian(self, **kwargs):
 def post(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

guardian = context["guardian"]
mentor = context["mentor"]

 form = GuardianForm(self.request.POST, instance=guardian)
 form = MentorForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor,
 )

 user_form = CDCModelForm(self.request.POST, instance=guardian.user)
 user_form = CDCModelForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor.user,
 )

 if form.is_valid() and user_form.is_valid():
 form.save()
Expand All@@ -226,4 +260,28 @@ def post_for_guardian(self, **kwargs):
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, "account/guardian/home.html", context)
 return render(self.request, "account/mentor/home.html", context)


@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 self.request,
 "Tell us a little about yourself before going on account.",
 )
 return redirect("welcome")

 if self.request.user.role == "guardian":
 return GuardianAccountHomeView.as_view()(self.request)

 if self.request.user.role == "mentor":
 return MentorAccountHomeView.as_view()(self.request)

 return super().dispatch(*args, **kwargs)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fixing form design a little#922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

karbassi
wants to merge
2
commits into

from

 Closed


Fixing form design a little
#922
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4f1c4bf

Fixing form design a little


karbassi Jun 4, 2022
b59ca84

Update wording on parent intake form.


karbassi Jun 6, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 29 additions & 27 deletions
accounts/templates/account/guardian/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,37 +5,16 @@

{% block contained_content %}

<section class="margin-top-3">
 <h2 class="title text-primary">Your Profile</h2>
 <p>Joined on {{ guardian.user.date_joined|naturalday|capfirst }}</p>

 <form id="profile_form" enctype="multipart/form-data" action="" method="post">
 {% csrf_token %}
 <div class="grid-x grid-margin-x">
 <div class="cell medium-6">{% bootstrap_field user_form.first_name %}</div>
 <div class="cell medium-6">{% bootstrap_field user_form.last_name %}</div>
 <div class="cell medium-6">{% bootstrap_field form.phone %}</div>
 <div class="cell medium-6">{% bootstrap_field form.zip %}</div>
 <div class="cell medium-6">{% bootstrap_field form.birthday %}</div>
 <div class="cell medium-6">{% bootstrap_field form.gender %}</div>
 <div class="cell medium-6">{% bootstrap_field form.race_ethnicity %}</div>
 </div>
 {% buttons %}
 <button type="submit" class="button">Save</button>
 {% endbuttons %}
 </form>
</section>

<section class="margin-top-3">
 <h2 class="title text-tertiary">Students</h2>
 {% if students %}
 <table class="students table table-striped">
 <table class="students">
 <thead>
 <tr class="text-muted">
 <th>Name</th>
 <th class="hidden-xs">Age</th>
 <th class="hidden-xs">Medical Conditions</th>
 <th class="hidden-xs">Medications</th>
 <!-- <th class="hidden-xs">Medical Conditions</th> -->
 <!-- <th class="hidden-xs">Medications</th> -->
 <th></th>
 </tr>
 </thead>
Expand All@@ -44,9 +23,9 @@ <h2 class="title text-tertiary">Students</h2>
 <tr>
 <td>{{ student.full_name }}</td>
 <td class="hidden-xs">{{ student.get_age }}</td>
 <td class="hidden-xs">{% if student.medical_conditions %}Yes{% else %}No{% endif %}</td>
 <td class="hidden-xs">{% if student.medications %}Yes{% else %}No{% endif %}</td>
 <td><a href="{% url 'student-detail' student.id %}" class="button small">Edit Info</a></td>
 <!-- <td class="hidden-xs">{% if student.medical_conditions %}Yes{% else %}No{% endif %}</td> -->
 <!-- <td class="hidden-xs">{% if student.medications %}Yes{% else %}No{% endif %}</td> -->
 <td class="text-right"><a href="{% url 'student-detail' student.id %}" class="button ">Edit Info</a></td>
 </tr>
 {% endfor %}
 </tbody>
Expand All@@ -57,6 +36,29 @@ <h2 class="title text-tertiary">Students</h2>
 {% endif %}
</section>

<section class="margin-top-3">
 <h2 class="title text-primary">Your Profile</h2>
 <p>Joined on {{ guardian.user.date_joined|naturalday|capfirst }}</p>

 <form id="profile_form" enctype="multipart/form-data" action="" method="post">
 {% csrf_token %}
 <div class="grid-x grid-margin-x">
 <div class="cell medium-6">{% bootstrap_field user_form.first_name %}</div>
 <div class="cell medium-6">{% bootstrap_field user_form.last_name %}</div>
 <div class="cell medium-6">{% bootstrap_field form.phone %}</div>
 <div class="cell medium-6">{% bootstrap_field form.zip %}</div>
 <div class="cell medium-6">{% bootstrap_field form.birthday %}</div>
 <div class="cell medium-6">{% bootstrap_field form.gender %}</div>
 <div class="cell medium-6">{% bootstrap_field form.race_ethnicity %}</div>
 </div>
 {% buttons %}
 <button type="submit" class="button">Save</button>
 {% endbuttons %}
 </form>
</section>



<section class="margin-top-3">
 <h2 class="title text-secondary">Upcoming Classes</h2>

Expand Down

246 changes: 152 additions & 94 deletions
accounts/views.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,17 +41,24 @@ class LoginView(MetadataMixin, AllAuthLoginView):


@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
class GuardianAccountHomeView(MetadataMixin, TemplateView):
 template_name = "account/guardian/home.html"
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 guardian = get_object_or_404(Guardian, user=self.request.user)
 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
 ).exists()

 if students == False:
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 messages.error(
 self.request,
 "Tell us a little about yourself before going on account.",
 "Please add at least one student to your account.",
 )
 return redirect("welcome")

Expand All@@ -67,62 +74,11 @@ def get_context_data(self, **kwargs):

 context["user"] = self.request.user

 if self.request.user.role == "mentor":
 return {**context, **self.get_context_data_for_mentor()}

 if self.request.user.role == "guardian":
 return {**context, **self.get_context_data_for_guardian()}

 return context

 def get_context_data_for_mentor(self):
 mentor = get_object_or_404(Mentor, user=self.request.user)

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 guardian = get_object_or_404(
 Guardian,
 user=self.request.user,
 )

 upcoming_sessions = orders.filter(is_active=True, session__start_date__gte=timezone.now()).order_by(
 "session__start_date"
 )

 past_sessions = orders.filter(is_active=True, session__start_date__lte=timezone.now()).order_by(
 "session__start_date"
 )

 meeting_orders = MeetingOrder.objects.select_related().filter(mentor=mentor)

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now(),
 ).order_by("meeting__start_date")

 account_complete = False

 if (
 mentor.first_name
 and mentor.last_name
 and mentor.avatar
 and mentor.background_check
 and past_sessions.count() > 0
 ):
 account_complete = True

 return {
 "mentor": mentor,
 "orders": orders,
 "upcoming_sessions": upcoming_sessions,
 "past_sessions": past_sessions,
 "meeting_orders": meeting_orders,
 "upcoming_meetings": upcoming_meetings,
 "account_complete": account_complete,
 }

 def get_context_data_for_guardian(self):
 guardian = get_object_or_404(Guardian, user=self.request.user)

 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
Expand All@@ -142,30 +98,20 @@ def get_context_data_for_guardian(self):
 session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 return {
 "guardian": guardian,
 "students": students,
 "student_orders": student_orders,
 "upcoming_orders": upcoming_orders,
 "past_orders": past_orders,
 context = {
 **context,
 **{
 "guardian": guardian,
 "students": students,
 "student_orders": student_orders,
 "upcoming_orders": upcoming_orders,
 "past_orders": past_orders,
 },
 }

 def get(self, *args, **kwargs):
 if self.request.user.role == "mentor":
 return self.get_for_mentor(**kwargs)

 if self.request.user.role == "guardian":
 return self.get_for_guardian(**kwargs)

 def get_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, "account/mentor/home.html", context)
 return context

 def get_for_guardian(self, **kwargs):
 def get(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = GuardianForm(instance=context["guardian"])
Expand All@@ -174,20 +120,19 @@ def get_for_guardian(self, **kwargs):
 return render(self.request, "account/guardian/home.html", context)

 def post(self, *args, **kwargs):
 if self.request.user.role == "mentor":
 return self.post_for_mentor(**kwargs)

 if self.request.user.role == "guardian":
 return self.post_for_guardian(**kwargs)

 def post_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

mentor = context["mentor"]
guardian = context["guardian"]

 form = MentorForm(self.request.POST, self.request.FILES, instance=mentor)
 form = GuardianForm(
 self.request.POST,
 instance=guardian,
 )

 user_form = CDCModelForm(self.request.POST, self.request.FILES, instance=mentor.user)
 user_form = CDCModelForm(
 self.request.POST,
 instance=guardian.user,
 )

 if form.is_valid() and user_form.is_valid():
 form.save()
Expand All@@ -202,16 +147,105 @@ def post_for_mentor(self, **kwargs):
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, "account/guardian/home.html", context)


@method_decorator(login_required, name="dispatch")
class MentorAccountHomeView(MetadataMixin, TemplateView):
 template_name = "account/mentor/home.html"
 title = "My Account | We All Code"

 def get_context_data(self, **kwargs):
 context = super().get_context_data(**kwargs)

 if "highlight" in self.request.GET:
 context["highlight"] = self.request.GET["highlight"]
 else:
 context["highlight"] = False

 context["user"] = self.request.user

 mentor = get_object_or_404(
 Mentor,
 user=self.request.user,
 )

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 )

 upcoming_sessions = orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now(),
 ).order_by("session__start_date")

 past_sessions = orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 meeting_orders = MeetingOrder.objects.select_related().filter(
 mentor=mentor,
 )

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now(),
 ).order_by(
 "meeting__start_date",
 )

 account_complete = False

 if (
 mentor.first_name
 and mentor.last_name
 and mentor.avatar
 and mentor.background_check
 and past_sessions.count() > 0
 ):
 account_complete = True

 context = {
 **context,
 **{
 "mentor": mentor,
 "orders": orders,
 "upcoming_sessions": upcoming_sessions,
 "past_sessions": past_sessions,
 "meeting_orders": meeting_orders,
 "upcoming_meetings": upcoming_meetings,
 "account_complete": account_complete,
 },
 }
 return context

 def get(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, "account/mentor/home.html", context)

 def post_for_guardian(self, **kwargs):
 def post(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

guardian = context["guardian"]
mentor = context["mentor"]

 form = GuardianForm(self.request.POST, instance=guardian)
 form = MentorForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor,
 )

 user_form = CDCModelForm(self.request.POST, instance=guardian.user)
 user_form = CDCModelForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor.user,
 )

 if form.is_valid() and user_form.is_valid():
 form.save()
Expand All@@ -226,4 +260,28 @@ def post_for_guardian(self, **kwargs):
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, "account/guardian/home.html", context)
 return render(self.request, "account/mentor/home.html", context)


@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 self.request,
 "Tell us a little about yourself before going on account.",
 )
 return redirect("welcome")

 if self.request.user.role == "guardian":
 return GuardianAccountHomeView.as_view()(self.request)

 if self.request.user.role == "mentor":
 return MentorAccountHomeView.as_view()(self.request)

 return super().dispatch(*args, **kwargs)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fixing form design a little#922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

karbassi
wants to merge
2
commits into

from

 Closed


Fixing form design a little
#922
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4f1c4bf

Fixing form design a little


karbassi Jun 4, 2022
b59ca84

Update wording on parent intake form.


karbassi Jun 6, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 29 additions & 27 deletions
accounts/templates/account/guardian/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,37 +5,16 @@

{% block contained_content %}

<section class="margin-top-3">
 <h2 class="title text-primary">Your Profile</h2>
 <p>Joined on {{ guardian.user.date_joined|naturalday|capfirst }}</p>

 <form id="profile_form" enctype="multipart/form-data" action="" method="post">
 {% csrf_token %}
 <div class="grid-x grid-margin-x">
 <div class="cell medium-6">{% bootstrap_field user_form.first_name %}</div>
 <div class="cell medium-6">{% bootstrap_field user_form.last_name %}</div>
 <div class="cell medium-6">{% bootstrap_field form.phone %}</div>
 <div class="cell medium-6">{% bootstrap_field form.zip %}</div>
 <div class="cell medium-6">{% bootstrap_field form.birthday %}</div>
 <div class="cell medium-6">{% bootstrap_field form.gender %}</div>
 <div class="cell medium-6">{% bootstrap_field form.race_ethnicity %}</div>
 </div>
 {% buttons %}
 <button type="submit" class="button">Save</button>
 {% endbuttons %}
 </form>
</section>

<section class="margin-top-3">
 <h2 class="title text-tertiary">Students</h2>
 {% if students %}
 <table class="students table table-striped">
 <table class="students">
 <thead>
 <tr class="text-muted">
 <th>Name</th>
 <th class="hidden-xs">Age</th>
 <th class="hidden-xs">Medical Conditions</th>
 <th class="hidden-xs">Medications</th>
 <!-- <th class="hidden-xs">Medical Conditions</th> -->
 <!-- <th class="hidden-xs">Medications</th> -->
 <th></th>
 </tr>
 </thead>
Expand All@@ -44,9 +23,9 @@ <h2 class="title text-tertiary">Students</h2>
 <tr>
 <td>{{ student.full_name }}</td>
 <td class="hidden-xs">{{ student.get_age }}</td>
 <td class="hidden-xs">{% if student.medical_conditions %}Yes{% else %}No{% endif %}</td>
 <td class="hidden-xs">{% if student.medications %}Yes{% else %}No{% endif %}</td>
 <td><a href="{% url 'student-detail' student.id %}" class="button small">Edit Info</a></td>
 <!-- <td class="hidden-xs">{% if student.medical_conditions %}Yes{% else %}No{% endif %}</td> -->
 <!-- <td class="hidden-xs">{% if student.medications %}Yes{% else %}No{% endif %}</td> -->
 <td class="text-right"><a href="{% url 'student-detail' student.id %}" class="button ">Edit Info</a></td>
 </tr>
 {% endfor %}
 </tbody>
Expand All@@ -57,6 +36,29 @@ <h2 class="title text-tertiary">Students</h2>
 {% endif %}
</section>

<section class="margin-top-3">
 <h2 class="title text-primary">Your Profile</h2>
 <p>Joined on {{ guardian.user.date_joined|naturalday|capfirst }}</p>

 <form id="profile_form" enctype="multipart/form-data" action="" method="post">
 {% csrf_token %}
 <div class="grid-x grid-margin-x">
 <div class="cell medium-6">{% bootstrap_field user_form.first_name %}</div>
 <div class="cell medium-6">{% bootstrap_field user_form.last_name %}</div>
 <div class="cell medium-6">{% bootstrap_field form.phone %}</div>
 <div class="cell medium-6">{% bootstrap_field form.zip %}</div>
 <div class="cell medium-6">{% bootstrap_field form.birthday %}</div>
 <div class="cell medium-6">{% bootstrap_field form.gender %}</div>
 <div class="cell medium-6">{% bootstrap_field form.race_ethnicity %}</div>
 </div>
 {% buttons %}
 <button type="submit" class="button">Save</button>
 {% endbuttons %}
 </form>
</section>



<section class="margin-top-3">
 <h2 class="title text-secondary">Upcoming Classes</h2>

Expand Down

246 changes: 152 additions & 94 deletions
accounts/views.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,17 +41,24 @@ class LoginView(MetadataMixin, AllAuthLoginView):


@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
class GuardianAccountHomeView(MetadataMixin, TemplateView):
 template_name = "account/guardian/home.html"
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 guardian = get_object_or_404(Guardian, user=self.request.user)
 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
 ).exists()

 if students == False:
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 messages.error(
 self.request,
 "Tell us a little about yourself before going on account.",
 "Please add at least one student to your account.",
 )
 return redirect("welcome")

Expand All@@ -67,62 +74,11 @@ def get_context_data(self, **kwargs):

 context["user"] = self.request.user

 if self.request.user.role == "mentor":
 return {**context, **self.get_context_data_for_mentor()}

 if self.request.user.role == "guardian":
 return {**context, **self.get_context_data_for_guardian()}

 return context

 def get_context_data_for_mentor(self):
 mentor = get_object_or_404(Mentor, user=self.request.user)

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 guardian = get_object_or_404(
 Guardian,
 user=self.request.user,
 )

 upcoming_sessions = orders.filter(is_active=True, session__start_date__gte=timezone.now()).order_by(
 "session__start_date"
 )

 past_sessions = orders.filter(is_active=True, session__start_date__lte=timezone.now()).order_by(
 "session__start_date"
 )

 meeting_orders = MeetingOrder.objects.select_related().filter(mentor=mentor)

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now(),
 ).order_by("meeting__start_date")

 account_complete = False

 if (
 mentor.first_name
 and mentor.last_name
 and mentor.avatar
 and mentor.background_check
 and past_sessions.count() > 0
 ):
 account_complete = True

 return {
 "mentor": mentor,
 "orders": orders,
 "upcoming_sessions": upcoming_sessions,
 "past_sessions": past_sessions,
 "meeting_orders": meeting_orders,
 "upcoming_meetings": upcoming_meetings,
 "account_complete": account_complete,
 }

 def get_context_data_for_guardian(self):
 guardian = get_object_or_404(Guardian, user=self.request.user)

 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
Expand All@@ -142,30 +98,20 @@ def get_context_data_for_guardian(self):
 session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 return {
 "guardian": guardian,
 "students": students,
 "student_orders": student_orders,
 "upcoming_orders": upcoming_orders,
 "past_orders": past_orders,
 context = {
 **context,
 **{
 "guardian": guardian,
 "students": students,
 "student_orders": student_orders,
 "upcoming_orders": upcoming_orders,
 "past_orders": past_orders,
 },
 }

 def get(self, *args, **kwargs):
 if self.request.user.role == "mentor":
 return self.get_for_mentor(**kwargs)

 if self.request.user.role == "guardian":
 return self.get_for_guardian(**kwargs)

 def get_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, "account/mentor/home.html", context)
 return context

 def get_for_guardian(self, **kwargs):
 def get(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = GuardianForm(instance=context["guardian"])
Expand All@@ -174,20 +120,19 @@ def get_for_guardian(self, **kwargs):
 return render(self.request, "account/guardian/home.html", context)

 def post(self, *args, **kwargs):
 if self.request.user.role == "mentor":
 return self.post_for_mentor(**kwargs)

 if self.request.user.role == "guardian":
 return self.post_for_guardian(**kwargs)

 def post_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

mentor = context["mentor"]
guardian = context["guardian"]

 form = MentorForm(self.request.POST, self.request.FILES, instance=mentor)
 form = GuardianForm(
 self.request.POST,
 instance=guardian,
 )

 user_form = CDCModelForm(self.request.POST, self.request.FILES, instance=mentor.user)
 user_form = CDCModelForm(
 self.request.POST,
 instance=guardian.user,
 )

 if form.is_valid() and user_form.is_valid():
 form.save()
Expand All@@ -202,16 +147,105 @@ def post_for_mentor(self, **kwargs):
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, "account/guardian/home.html", context)


@method_decorator(login_required, name="dispatch")
class MentorAccountHomeView(MetadataMixin, TemplateView):
 template_name = "account/mentor/home.html"
 title = "My Account | We All Code"

 def get_context_data(self, **kwargs):
 context = super().get_context_data(**kwargs)

 if "highlight" in self.request.GET:
 context["highlight"] = self.request.GET["highlight"]
 else:
 context["highlight"] = False

 context["user"] = self.request.user

 mentor = get_object_or_404(
 Mentor,
 user=self.request.user,
 )

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 )

 upcoming_sessions = orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now(),
 ).order_by("session__start_date")

 past_sessions = orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 meeting_orders = MeetingOrder.objects.select_related().filter(
 mentor=mentor,
 )

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now(),
 ).order_by(
 "meeting__start_date",
 )

 account_complete = False

 if (
 mentor.first_name
 and mentor.last_name
 and mentor.avatar
 and mentor.background_check
 and past_sessions.count() > 0
 ):
 account_complete = True

 context = {
 **context,
 **{
 "mentor": mentor,
 "orders": orders,
 "upcoming_sessions": upcoming_sessions,
 "past_sessions": past_sessions,
 "meeting_orders": meeting_orders,
 "upcoming_meetings": upcoming_meetings,
 "account_complete": account_complete,
 },
 }
 return context

 def get(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, "account/mentor/home.html", context)

 def post_for_guardian(self, **kwargs):
 def post(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

guardian = context["guardian"]
mentor = context["mentor"]

 form = GuardianForm(self.request.POST, instance=guardian)
 form = MentorForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor,
 )

 user_form = CDCModelForm(self.request.POST, instance=guardian.user)
 user_form = CDCModelForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor.user,
 )

 if form.is_valid() and user_form.is_valid():
 form.save()
Expand All@@ -226,4 +260,28 @@ def post_for_guardian(self, **kwargs):
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, "account/guardian/home.html", context)
 return render(self.request, "account/mentor/home.html", context)


@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 self.request,
 "Tell us a little about yourself before going on account.",
 )
 return redirect("welcome")

 if self.request.user.role == "guardian":
 return GuardianAccountHomeView.as_view()(self.request)

 if self.request.user.role == "mentor":
 return MentorAccountHomeView.as_view()(self.request)

 return super().dispatch(*args, **kwargs)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fixing form design a little#922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

karbassi
wants to merge
2
commits into

from

 Closed


Fixing form design a little
#922
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4f1c4bf

Fixing form design a little


karbassi Jun 4, 2022
b59ca84

Update wording on parent intake form.


karbassi Jun 6, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 29 additions & 27 deletions
accounts/templates/account/guardian/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,37 +5,16 @@

{% block contained_content %}

<section class="margin-top-3">
 <h2 class="title text-primary">Your Profile</h2>
 <p>Joined on {{ guardian.user.date_joined|naturalday|capfirst }}</p>

 <form id="profile_form" enctype="multipart/form-data" action="" method="post">
 {% csrf_token %}
 <div class="grid-x grid-margin-x">
 <div class="cell medium-6">{% bootstrap_field user_form.first_name %}</div>
 <div class="cell medium-6">{% bootstrap_field user_form.last_name %}</div>
 <div class="cell medium-6">{% bootstrap_field form.phone %}</div>
 <div class="cell medium-6">{% bootstrap_field form.zip %}</div>
 <div class="cell medium-6">{% bootstrap_field form.birthday %}</div>
 <div class="cell medium-6">{% bootstrap_field form.gender %}</div>
 <div class="cell medium-6">{% bootstrap_field form.race_ethnicity %}</div>
 </div>
 {% buttons %}
 <button type="submit" class="button">Save</button>
 {% endbuttons %}
 </form>
</section>

<section class="margin-top-3">
 <h2 class="title text-tertiary">Students</h2>
 {% if students %}
 <table class="students table table-striped">
 <table class="students">
 <thead>
 <tr class="text-muted">
 <th>Name</th>
 <th class="hidden-xs">Age</th>
 <th class="hidden-xs">Medical Conditions</th>
 <th class="hidden-xs">Medications</th>
 <!-- <th class="hidden-xs">Medical Conditions</th> -->
 <!-- <th class="hidden-xs">Medications</th> -->
 <th></th>
 </tr>
 </thead>
Expand All@@ -44,9 +23,9 @@ <h2 class="title text-tertiary">Students</h2>
 <tr>
 <td>{{ student.full_name }}</td>
 <td class="hidden-xs">{{ student.get_age }}</td>
 <td class="hidden-xs">{% if student.medical_conditions %}Yes{% else %}No{% endif %}</td>
 <td class="hidden-xs">{% if student.medications %}Yes{% else %}No{% endif %}</td>
 <td><a href="{% url 'student-detail' student.id %}" class="button small">Edit Info</a></td>
 <!-- <td class="hidden-xs">{% if student.medical_conditions %}Yes{% else %}No{% endif %}</td> -->
 <!-- <td class="hidden-xs">{% if student.medications %}Yes{% else %}No{% endif %}</td> -->
 <td class="text-right"><a href="{% url 'student-detail' student.id %}" class="button ">Edit Info</a></td>
 </tr>
 {% endfor %}
 </tbody>
Expand All@@ -57,6 +36,29 @@ <h2 class="title text-tertiary">Students</h2>
 {% endif %}
</section>

<section class="margin-top-3">
 <h2 class="title text-primary">Your Profile</h2>
 <p>Joined on {{ guardian.user.date_joined|naturalday|capfirst }}</p>

 <form id="profile_form" enctype="multipart/form-data" action="" method="post">
 {% csrf_token %}
 <div class="grid-x grid-margin-x">
 <div class="cell medium-6">{% bootstrap_field user_form.first_name %}</div>
 <div class="cell medium-6">{% bootstrap_field user_form.last_name %}</div>
 <div class="cell medium-6">{% bootstrap_field form.phone %}</div>
 <div class="cell medium-6">{% bootstrap_field form.zip %}</div>
 <div class="cell medium-6">{% bootstrap_field form.birthday %}</div>
 <div class="cell medium-6">{% bootstrap_field form.gender %}</div>
 <div class="cell medium-6">{% bootstrap_field form.race_ethnicity %}</div>
 </div>
 {% buttons %}
 <button type="submit" class="button">Save</button>
 {% endbuttons %}
 </form>
</section>



<section class="margin-top-3">
 <h2 class="title text-secondary">Upcoming Classes</h2>

Expand Down

246 changes: 152 additions & 94 deletions
accounts/views.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,17 +41,24 @@ class LoginView(MetadataMixin, AllAuthLoginView):


@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
class GuardianAccountHomeView(MetadataMixin, TemplateView):
 template_name = "account/guardian/home.html"
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 guardian = get_object_or_404(Guardian, user=self.request.user)
 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
 ).exists()

 if students == False:
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 messages.error(
 self.request,
 "Tell us a little about yourself before going on account.",
 "Please add at least one student to your account.",
 )
 return redirect("welcome")

Expand All@@ -67,62 +74,11 @@ def get_context_data(self, **kwargs):

 context["user"] = self.request.user

 if self.request.user.role == "mentor":
 return {**context, **self.get_context_data_for_mentor()}

 if self.request.user.role == "guardian":
 return {**context, **self.get_context_data_for_guardian()}

 return context

 def get_context_data_for_mentor(self):
 mentor = get_object_or_404(Mentor, user=self.request.user)

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 guardian = get_object_or_404(
 Guardian,
 user=self.request.user,
 )

 upcoming_sessions = orders.filter(is_active=True, session__start_date__gte=timezone.now()).order_by(
 "session__start_date"
 )

 past_sessions = orders.filter(is_active=True, session__start_date__lte=timezone.now()).order_by(
 "session__start_date"
 )

 meeting_orders = MeetingOrder.objects.select_related().filter(mentor=mentor)

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now(),
 ).order_by("meeting__start_date")

 account_complete = False

 if (
 mentor.first_name
 and mentor.last_name
 and mentor.avatar
 and mentor.background_check
 and past_sessions.count() > 0
 ):
 account_complete = True

 return {
 "mentor": mentor,
 "orders": orders,
 "upcoming_sessions": upcoming_sessions,
 "past_sessions": past_sessions,
 "meeting_orders": meeting_orders,
 "upcoming_meetings": upcoming_meetings,
 "account_complete": account_complete,
 }

 def get_context_data_for_guardian(self):
 guardian = get_object_or_404(Guardian, user=self.request.user)

 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
Expand All@@ -142,30 +98,20 @@ def get_context_data_for_guardian(self):
 session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 return {
 "guardian": guardian,
 "students": students,
 "student_orders": student_orders,
 "upcoming_orders": upcoming_orders,
 "past_orders": past_orders,
 context = {
 **context,
 **{
 "guardian": guardian,
 "students": students,
 "student_orders": student_orders,
 "upcoming_orders": upcoming_orders,
 "past_orders": past_orders,
 },
 }

 def get(self, *args, **kwargs):
 if self.request.user.role == "mentor":
 return self.get_for_mentor(**kwargs)

 if self.request.user.role == "guardian":
 return self.get_for_guardian(**kwargs)

 def get_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, "account/mentor/home.html", context)
 return context

 def get_for_guardian(self, **kwargs):
 def get(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = GuardianForm(instance=context["guardian"])
Expand All@@ -174,20 +120,19 @@ def get_for_guardian(self, **kwargs):
 return render(self.request, "account/guardian/home.html", context)

 def post(self, *args, **kwargs):
 if self.request.user.role == "mentor":
 return self.post_for_mentor(**kwargs)

 if self.request.user.role == "guardian":
 return self.post_for_guardian(**kwargs)

 def post_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

mentor = context["mentor"]
guardian = context["guardian"]

 form = MentorForm(self.request.POST, self.request.FILES, instance=mentor)
 form = GuardianForm(
 self.request.POST,
 instance=guardian,
 )

 user_form = CDCModelForm(self.request.POST, self.request.FILES, instance=mentor.user)
 user_form = CDCModelForm(
 self.request.POST,
 instance=guardian.user,
 )

 if form.is_valid() and user_form.is_valid():
 form.save()
Expand All@@ -202,16 +147,105 @@ def post_for_mentor(self, **kwargs):
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, "account/guardian/home.html", context)


@method_decorator(login_required, name="dispatch")
class MentorAccountHomeView(MetadataMixin, TemplateView):
 template_name = "account/mentor/home.html"
 title = "My Account | We All Code"

 def get_context_data(self, **kwargs):
 context = super().get_context_data(**kwargs)

 if "highlight" in self.request.GET:
 context["highlight"] = self.request.GET["highlight"]
 else:
 context["highlight"] = False

 context["user"] = self.request.user

 mentor = get_object_or_404(
 Mentor,
 user=self.request.user,
 )

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 )

 upcoming_sessions = orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now(),
 ).order_by("session__start_date")

 past_sessions = orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 meeting_orders = MeetingOrder.objects.select_related().filter(
 mentor=mentor,
 )

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now(),
 ).order_by(
 "meeting__start_date",
 )

 account_complete = False

 if (
 mentor.first_name
 and mentor.last_name
 and mentor.avatar
 and mentor.background_check
 and past_sessions.count() > 0
 ):
 account_complete = True

 context = {
 **context,
 **{
 "mentor": mentor,
 "orders": orders,
 "upcoming_sessions": upcoming_sessions,
 "past_sessions": past_sessions,
 "meeting_orders": meeting_orders,
 "upcoming_meetings": upcoming_meetings,
 "account_complete": account_complete,
 },
 }
 return context

 def get(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, "account/mentor/home.html", context)

 def post_for_guardian(self, **kwargs):
 def post(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

guardian = context["guardian"]
mentor = context["mentor"]

 form = GuardianForm(self.request.POST, instance=guardian)
 form = MentorForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor,
 )

 user_form = CDCModelForm(self.request.POST, instance=guardian.user)
 user_form = CDCModelForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor.user,
 )

 if form.is_valid() and user_form.is_valid():
 form.save()
Expand All@@ -226,4 +260,28 @@ def post_for_guardian(self, **kwargs):
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, "account/guardian/home.html", context)
 return render(self.request, "account/mentor/home.html", context)


@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 self.request,
 "Tell us a little about yourself before going on account.",
 )
 return redirect("welcome")

 if self.request.user.role == "guardian":
 return GuardianAccountHomeView.as_view()(self.request)

 if self.request.user.role == "mentor":
 return MentorAccountHomeView.as_view()(self.request)

 return super().dispatch(*args, **kwargs)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fixing form design a little#922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

karbassi
wants to merge
2
commits into

from

 Closed


Fixing form design a little
#922
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4f1c4bf

Fixing form design a little


karbassi Jun 4, 2022
b59ca84

Update wording on parent intake form.


karbassi Jun 6, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 29 additions & 27 deletions
accounts/templates/account/guardian/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,37 +5,16 @@

{% block contained_content %}

<section class="margin-top-3">
 <h2 class="title text-primary">Your Profile</h2>
 <p>Joined on {{ guardian.user.date_joined|naturalday|capfirst }}</p>

 <form id="profile_form" enctype="multipart/form-data" action="" method="post">
 {% csrf_token %}
 <div class="grid-x grid-margin-x">
 <div class="cell medium-6">{% bootstrap_field user_form.first_name %}</div>
 <div class="cell medium-6">{% bootstrap_field user_form.last_name %}</div>
 <div class="cell medium-6">{% bootstrap_field form.phone %}</div>
 <div class="cell medium-6">{% bootstrap_field form.zip %}</div>
 <div class="cell medium-6">{% bootstrap_field form.birthday %}</div>
 <div class="cell medium-6">{% bootstrap_field form.gender %}</div>
 <div class="cell medium-6">{% bootstrap_field form.race_ethnicity %}</div>
 </div>
 {% buttons %}
 <button type="submit" class="button">Save</button>
 {% endbuttons %}
 </form>
</section>

<section class="margin-top-3">
 <h2 class="title text-tertiary">Students</h2>
 {% if students %}
 <table class="students table table-striped">
 <table class="students">
 <thead>
 <tr class="text-muted">
 <th>Name</th>
 <th class="hidden-xs">Age</th>
 <th class="hidden-xs">Medical Conditions</th>
 <th class="hidden-xs">Medications</th>
 <!-- <th class="hidden-xs">Medical Conditions</th> -->
 <!-- <th class="hidden-xs">Medications</th> -->
 <th></th>
 </tr>
 </thead>
Expand All@@ -44,9 +23,9 @@ <h2 class="title text-tertiary">Students</h2>
 <tr>
 <td>{{ student.full_name }}</td>
 <td class="hidden-xs">{{ student.get_age }}</td>
 <td class="hidden-xs">{% if student.medical_conditions %}Yes{% else %}No{% endif %}</td>
 <td class="hidden-xs">{% if student.medications %}Yes{% else %}No{% endif %}</td>
 <td><a href="{% url 'student-detail' student.id %}" class="button small">Edit Info</a></td>
 <!-- <td class="hidden-xs">{% if student.medical_conditions %}Yes{% else %}No{% endif %}</td> -->
 <!-- <td class="hidden-xs">{% if student.medications %}Yes{% else %}No{% endif %}</td> -->
 <td class="text-right"><a href="{% url 'student-detail' student.id %}" class="button ">Edit Info</a></td>
 </tr>
 {% endfor %}
 </tbody>
Expand All@@ -57,6 +36,29 @@ <h2 class="title text-tertiary">Students</h2>
 {% endif %}
</section>

<section class="margin-top-3">
 <h2 class="title text-primary">Your Profile</h2>
 <p>Joined on {{ guardian.user.date_joined|naturalday|capfirst }}</p>

 <form id="profile_form" enctype="multipart/form-data" action="" method="post">
 {% csrf_token %}
 <div class="grid-x grid-margin-x">
 <div class="cell medium-6">{% bootstrap_field user_form.first_name %}</div>
 <div class="cell medium-6">{% bootstrap_field user_form.last_name %}</div>
 <div class="cell medium-6">{% bootstrap_field form.phone %}</div>
 <div class="cell medium-6">{% bootstrap_field form.zip %}</div>
 <div class="cell medium-6">{% bootstrap_field form.birthday %}</div>
 <div class="cell medium-6">{% bootstrap_field form.gender %}</div>
 <div class="cell medium-6">{% bootstrap_field form.race_ethnicity %}</div>
 </div>
 {% buttons %}
 <button type="submit" class="button">Save</button>
 {% endbuttons %}
 </form>
</section>



<section class="margin-top-3">
 <h2 class="title text-secondary">Upcoming Classes</h2>

Expand Down

246 changes: 152 additions & 94 deletions
accounts/views.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,17 +41,24 @@ class LoginView(MetadataMixin, AllAuthLoginView):


@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
class GuardianAccountHomeView(MetadataMixin, TemplateView):
 template_name = "account/guardian/home.html"
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 guardian = get_object_or_404(Guardian, user=self.request.user)
 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
 ).exists()

 if students == False:
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 messages.error(
 self.request,
 "Tell us a little about yourself before going on account.",
 "Please add at least one student to your account.",
 )
 return redirect("welcome")

Expand All@@ -67,62 +74,11 @@ def get_context_data(self, **kwargs):

 context["user"] = self.request.user

 if self.request.user.role == "mentor":
 return {**context, **self.get_context_data_for_mentor()}

 if self.request.user.role == "guardian":
 return {**context, **self.get_context_data_for_guardian()}

 return context

 def get_context_data_for_mentor(self):
 mentor = get_object_or_404(Mentor, user=self.request.user)

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 guardian = get_object_or_404(
 Guardian,
 user=self.request.user,
 )

 upcoming_sessions = orders.filter(is_active=True, session__start_date__gte=timezone.now()).order_by(
 "session__start_date"
 )

 past_sessions = orders.filter(is_active=True, session__start_date__lte=timezone.now()).order_by(
 "session__start_date"
 )

 meeting_orders = MeetingOrder.objects.select_related().filter(mentor=mentor)

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now(),
 ).order_by("meeting__start_date")

 account_complete = False

 if (
 mentor.first_name
 and mentor.last_name
 and mentor.avatar
 and mentor.background_check
 and past_sessions.count() > 0
 ):
 account_complete = True

 return {
 "mentor": mentor,
 "orders": orders,
 "upcoming_sessions": upcoming_sessions,
 "past_sessions": past_sessions,
 "meeting_orders": meeting_orders,
 "upcoming_meetings": upcoming_meetings,
 "account_complete": account_complete,
 }

 def get_context_data_for_guardian(self):
 guardian = get_object_or_404(Guardian, user=self.request.user)

 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
Expand All@@ -142,30 +98,20 @@ def get_context_data_for_guardian(self):
 session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 return {
 "guardian": guardian,
 "students": students,
 "student_orders": student_orders,
 "upcoming_orders": upcoming_orders,
 "past_orders": past_orders,
 context = {
 **context,
 **{
 "guardian": guardian,
 "students": students,
 "student_orders": student_orders,
 "upcoming_orders": upcoming_orders,
 "past_orders": past_orders,
 },
 }

 def get(self, *args, **kwargs):
 if self.request.user.role == "mentor":
 return self.get_for_mentor(**kwargs)

 if self.request.user.role == "guardian":
 return self.get_for_guardian(**kwargs)

 def get_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, "account/mentor/home.html", context)
 return context

 def get_for_guardian(self, **kwargs):
 def get(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = GuardianForm(instance=context["guardian"])
Expand All@@ -174,20 +120,19 @@ def get_for_guardian(self, **kwargs):
 return render(self.request, "account/guardian/home.html", context)

 def post(self, *args, **kwargs):
 if self.request.user.role == "mentor":
 return self.post_for_mentor(**kwargs)

 if self.request.user.role == "guardian":
 return self.post_for_guardian(**kwargs)

 def post_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

mentor = context["mentor"]
guardian = context["guardian"]

 form = MentorForm(self.request.POST, self.request.FILES, instance=mentor)
 form = GuardianForm(
 self.request.POST,
 instance=guardian,
 )

 user_form = CDCModelForm(self.request.POST, self.request.FILES, instance=mentor.user)
 user_form = CDCModelForm(
 self.request.POST,
 instance=guardian.user,
 )

 if form.is_valid() and user_form.is_valid():
 form.save()
Expand All@@ -202,16 +147,105 @@ def post_for_mentor(self, **kwargs):
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, "account/guardian/home.html", context)


@method_decorator(login_required, name="dispatch")
class MentorAccountHomeView(MetadataMixin, TemplateView):
 template_name = "account/mentor/home.html"
 title = "My Account | We All Code"

 def get_context_data(self, **kwargs):
 context = super().get_context_data(**kwargs)

 if "highlight" in self.request.GET:
 context["highlight"] = self.request.GET["highlight"]
 else:
 context["highlight"] = False

 context["user"] = self.request.user

 mentor = get_object_or_404(
 Mentor,
 user=self.request.user,
 )

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 )

 upcoming_sessions = orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now(),
 ).order_by("session__start_date")

 past_sessions = orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 meeting_orders = MeetingOrder.objects.select_related().filter(
 mentor=mentor,
 )

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now(),
 ).order_by(
 "meeting__start_date",
 )

 account_complete = False

 if (
 mentor.first_name
 and mentor.last_name
 and mentor.avatar
 and mentor.background_check
 and past_sessions.count() > 0
 ):
 account_complete = True

 context = {
 **context,
 **{
 "mentor": mentor,
 "orders": orders,
 "upcoming_sessions": upcoming_sessions,
 "past_sessions": past_sessions,
 "meeting_orders": meeting_orders,
 "upcoming_meetings": upcoming_meetings,
 "account_complete": account_complete,
 },
 }
 return context

 def get(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, "account/mentor/home.html", context)

 def post_for_guardian(self, **kwargs):
 def post(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

guardian = context["guardian"]
mentor = context["mentor"]

 form = GuardianForm(self.request.POST, instance=guardian)
 form = MentorForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor,
 )

 user_form = CDCModelForm(self.request.POST, instance=guardian.user)
 user_form = CDCModelForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor.user,
 )

 if form.is_valid() and user_form.is_valid():
 form.save()
Expand All@@ -226,4 +260,28 @@ def post_for_guardian(self, **kwargs):
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, "account/guardian/home.html", context)
 return render(self.request, "account/mentor/home.html", context)


@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 self.request,
 "Tell us a little about yourself before going on account.",
 )
 return redirect("welcome")

 if self.request.user.role == "guardian":
 return GuardianAccountHomeView.as_view()(self.request)

 if self.request.user.role == "mentor":
 return MentorAccountHomeView.as_view()(self.request)

 return super().dispatch(*args, **kwargs)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fixing form design a little#922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

karbassi
wants to merge
2
commits into

from

 Closed


Fixing form design a little
#922
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4f1c4bf

Fixing form design a little


karbassi Jun 4, 2022
b59ca84

Update wording on parent intake form.


karbassi Jun 6, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 29 additions & 27 deletions
accounts/templates/account/guardian/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,37 +5,16 @@

{% block contained_content %}

<section class="margin-top-3">
 <h2 class="title text-primary">Your Profile</h2>
 <p>Joined on {{ guardian.user.date_joined|naturalday|capfirst }}</p>

 <form id="profile_form" enctype="multipart/form-data" action="" method="post">
 {% csrf_token %}
 <div class="grid-x grid-margin-x">
 <div class="cell medium-6">{% bootstrap_field user_form.first_name %}</div>
 <div class="cell medium-6">{% bootstrap_field user_form.last_name %}</div>
 <div class="cell medium-6">{% bootstrap_field form.phone %}</div>
 <div class="cell medium-6">{% bootstrap_field form.zip %}</div>
 <div class="cell medium-6">{% bootstrap_field form.birthday %}</div>
 <div class="cell medium-6">{% bootstrap_field form.gender %}</div>
 <div class="cell medium-6">{% bootstrap_field form.race_ethnicity %}</div>
 </div>
 {% buttons %}
 <button type="submit" class="button">Save</button>
 {% endbuttons %}
 </form>
</section>

<section class="margin-top-3">
 <h2 class="title text-tertiary">Students</h2>
 {% if students %}
 <table class="students table table-striped">
 <table class="students">
 <thead>
 <tr class="text-muted">
 <th>Name</th>
 <th class="hidden-xs">Age</th>
 <th class="hidden-xs">Medical Conditions</th>
 <th class="hidden-xs">Medications</th>
 <!-- <th class="hidden-xs">Medical Conditions</th> -->
 <!-- <th class="hidden-xs">Medications</th> -->
 <th></th>
 </tr>
 </thead>
Expand All@@ -44,9 +23,9 @@ <h2 class="title text-tertiary">Students</h2>
 <tr>
 <td>{{ student.full_name }}</td>
 <td class="hidden-xs">{{ student.get_age }}</td>
 <td class="hidden-xs">{% if student.medical_conditions %}Yes{% else %}No{% endif %}</td>
 <td class="hidden-xs">{% if student.medications %}Yes{% else %}No{% endif %}</td>
 <td><a href="{% url 'student-detail' student.id %}" class="button small">Edit Info</a></td>
 <!-- <td class="hidden-xs">{% if student.medical_conditions %}Yes{% else %}No{% endif %}</td> -->
 <!-- <td class="hidden-xs">{% if student.medications %}Yes{% else %}No{% endif %}</td> -->
 <td class="text-right"><a href="{% url 'student-detail' student.id %}" class="button ">Edit Info</a></td>
 </tr>
 {% endfor %}
 </tbody>
Expand All@@ -57,6 +36,29 @@ <h2 class="title text-tertiary">Students</h2>
 {% endif %}
</section>

<section class="margin-top-3">
 <h2 class="title text-primary">Your Profile</h2>
 <p>Joined on {{ guardian.user.date_joined|naturalday|capfirst }}</p>

 <form id="profile_form" enctype="multipart/form-data" action="" method="post">
 {% csrf_token %}
 <div class="grid-x grid-margin-x">
 <div class="cell medium-6">{% bootstrap_field user_form.first_name %}</div>
 <div class="cell medium-6">{% bootstrap_field user_form.last_name %}</div>
 <div class="cell medium-6">{% bootstrap_field form.phone %}</div>
 <div class="cell medium-6">{% bootstrap_field form.zip %}</div>
 <div class="cell medium-6">{% bootstrap_field form.birthday %}</div>
 <div class="cell medium-6">{% bootstrap_field form.gender %}</div>
 <div class="cell medium-6">{% bootstrap_field form.race_ethnicity %}</div>
 </div>
 {% buttons %}
 <button type="submit" class="button">Save</button>
 {% endbuttons %}
 </form>
</section>



<section class="margin-top-3">
 <h2 class="title text-secondary">Upcoming Classes</h2>

Expand Down

246 changes: 152 additions & 94 deletions
accounts/views.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,17 +41,24 @@ class LoginView(MetadataMixin, AllAuthLoginView):


@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
class GuardianAccountHomeView(MetadataMixin, TemplateView):
 template_name = "account/guardian/home.html"
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 guardian = get_object_or_404(Guardian, user=self.request.user)
 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
 ).exists()

 if students == False:
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 messages.error(
 self.request,
 "Tell us a little about yourself before going on account.",
 "Please add at least one student to your account.",
 )
 return redirect("welcome")

Expand All@@ -67,62 +74,11 @@ def get_context_data(self, **kwargs):

 context["user"] = self.request.user

 if self.request.user.role == "mentor":
 return {**context, **self.get_context_data_for_mentor()}

 if self.request.user.role == "guardian":
 return {**context, **self.get_context_data_for_guardian()}

 return context

 def get_context_data_for_mentor(self):
 mentor = get_object_or_404(Mentor, user=self.request.user)

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 guardian = get_object_or_404(
 Guardian,
 user=self.request.user,
 )

 upcoming_sessions = orders.filter(is_active=True, session__start_date__gte=timezone.now()).order_by(
 "session__start_date"
 )

 past_sessions = orders.filter(is_active=True, session__start_date__lte=timezone.now()).order_by(
 "session__start_date"
 )

 meeting_orders = MeetingOrder.objects.select_related().filter(mentor=mentor)

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now(),
 ).order_by("meeting__start_date")

 account_complete = False

 if (
 mentor.first_name
 and mentor.last_name
 and mentor.avatar
 and mentor.background_check
 and past_sessions.count() > 0
 ):
 account_complete = True

 return {
 "mentor": mentor,
 "orders": orders,
 "upcoming_sessions": upcoming_sessions,
 "past_sessions": past_sessions,
 "meeting_orders": meeting_orders,
 "upcoming_meetings": upcoming_meetings,
 "account_complete": account_complete,
 }

 def get_context_data_for_guardian(self):
 guardian = get_object_or_404(Guardian, user=self.request.user)

 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
Expand All@@ -142,30 +98,20 @@ def get_context_data_for_guardian(self):
 session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 return {
 "guardian": guardian,
 "students": students,
 "student_orders": student_orders,
 "upcoming_orders": upcoming_orders,
 "past_orders": past_orders,
 context = {
 **context,
 **{
 "guardian": guardian,
 "students": students,
 "student_orders": student_orders,
 "upcoming_orders": upcoming_orders,
 "past_orders": past_orders,
 },
 }

 def get(self, *args, **kwargs):
 if self.request.user.role == "mentor":
 return self.get_for_mentor(**kwargs)

 if self.request.user.role == "guardian":
 return self.get_for_guardian(**kwargs)

 def get_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, "account/mentor/home.html", context)
 return context

 def get_for_guardian(self, **kwargs):
 def get(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = GuardianForm(instance=context["guardian"])
Expand All@@ -174,20 +120,19 @@ def get_for_guardian(self, **kwargs):
 return render(self.request, "account/guardian/home.html", context)

 def post(self, *args, **kwargs):
 if self.request.user.role == "mentor":
 return self.post_for_mentor(**kwargs)

 if self.request.user.role == "guardian":
 return self.post_for_guardian(**kwargs)

 def post_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

mentor = context["mentor"]
guardian = context["guardian"]

 form = MentorForm(self.request.POST, self.request.FILES, instance=mentor)
 form = GuardianForm(
 self.request.POST,
 instance=guardian,
 )

 user_form = CDCModelForm(self.request.POST, self.request.FILES, instance=mentor.user)
 user_form = CDCModelForm(
 self.request.POST,
 instance=guardian.user,
 )

 if form.is_valid() and user_form.is_valid():
 form.save()
Expand All@@ -202,16 +147,105 @@ def post_for_mentor(self, **kwargs):
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, "account/guardian/home.html", context)


@method_decorator(login_required, name="dispatch")
class MentorAccountHomeView(MetadataMixin, TemplateView):
 template_name = "account/mentor/home.html"
 title = "My Account | We All Code"

 def get_context_data(self, **kwargs):
 context = super().get_context_data(**kwargs)

 if "highlight" in self.request.GET:
 context["highlight"] = self.request.GET["highlight"]
 else:
 context["highlight"] = False

 context["user"] = self.request.user

 mentor = get_object_or_404(
 Mentor,
 user=self.request.user,
 )

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 )

 upcoming_sessions = orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now(),
 ).order_by("session__start_date")

 past_sessions = orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 meeting_orders = MeetingOrder.objects.select_related().filter(
 mentor=mentor,
 )

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now(),
 ).order_by(
 "meeting__start_date",
 )

 account_complete = False

 if (
 mentor.first_name
 and mentor.last_name
 and mentor.avatar
 and mentor.background_check
 and past_sessions.count() > 0
 ):
 account_complete = True

 context = {
 **context,
 **{
 "mentor": mentor,
 "orders": orders,
 "upcoming_sessions": upcoming_sessions,
 "past_sessions": past_sessions,
 "meeting_orders": meeting_orders,
 "upcoming_meetings": upcoming_meetings,
 "account_complete": account_complete,
 },
 }
 return context

 def get(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, "account/mentor/home.html", context)

 def post_for_guardian(self, **kwargs):
 def post(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

guardian = context["guardian"]
mentor = context["mentor"]

 form = GuardianForm(self.request.POST, instance=guardian)
 form = MentorForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor,
 )

 user_form = CDCModelForm(self.request.POST, instance=guardian.user)
 user_form = CDCModelForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor.user,
 )

 if form.is_valid() and user_form.is_valid():
 form.save()
Expand All@@ -226,4 +260,28 @@ def post_for_guardian(self, **kwargs):
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, "account/guardian/home.html", context)
 return render(self.request, "account/mentor/home.html", context)


@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 self.request,
 "Tell us a little about yourself before going on account.",
 )
 return redirect("welcome")

 if self.request.user.role == "guardian":
 return GuardianAccountHomeView.as_view()(self.request)

 if self.request.user.role == "mentor":
 return MentorAccountHomeView.as_view()(self.request)

 return super().dispatch(*args, **kwargs)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fixing form design a little#922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

karbassi
wants to merge
2
commits into

from

 Closed


Fixing form design a little
#922
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
4f1c4bf

Fixing form design a little


karbassi Jun 4, 2022
b59ca84

Update wording on parent intake form.


karbassi Jun 6, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


56 changes: 29 additions & 27 deletions
accounts/templates/account/guardian/home.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,37 +5,16 @@

{% block contained_content %}

<section class="margin-top-3">
 <h2 class="title text-primary">Your Profile</h2>
 <p>Joined on {{ guardian.user.date_joined|naturalday|capfirst }}</p>

 <form id="profile_form" enctype="multipart/form-data" action="" method="post">
 {% csrf_token %}
 <div class="grid-x grid-margin-x">
 <div class="cell medium-6">{% bootstrap_field user_form.first_name %}</div>
 <div class="cell medium-6">{% bootstrap_field user_form.last_name %}</div>
 <div class="cell medium-6">{% bootstrap_field form.phone %}</div>
 <div class="cell medium-6">{% bootstrap_field form.zip %}</div>
 <div class="cell medium-6">{% bootstrap_field form.birthday %}</div>
 <div class="cell medium-6">{% bootstrap_field form.gender %}</div>
 <div class="cell medium-6">{% bootstrap_field form.race_ethnicity %}</div>
 </div>
 {% buttons %}
 <button type="submit" class="button">Save</button>
 {% endbuttons %}
 </form>
</section>

<section class="margin-top-3">
 <h2 class="title text-tertiary">Students</h2>
 {% if students %}
 <table class="students table table-striped">
 <table class="students">
 <thead>
 <tr class="text-muted">
 <th>Name</th>
 <th class="hidden-xs">Age</th>
 <th class="hidden-xs">Medical Conditions</th>
 <th class="hidden-xs">Medications</th>
 <!-- <th class="hidden-xs">Medical Conditions</th> -->
 <!-- <th class="hidden-xs">Medications</th> -->
 <th></th>
 </tr>
 </thead>
Expand All@@ -44,9 +23,9 @@ <h2 class="title text-tertiary">Students</h2>
 <tr>
 <td>{{ student.full_name }}</td>
 <td class="hidden-xs">{{ student.get_age }}</td>
 <td class="hidden-xs">{% if student.medical_conditions %}Yes{% else %}No{% endif %}</td>
 <td class="hidden-xs">{% if student.medications %}Yes{% else %}No{% endif %}</td>
 <td><a href="{% url 'student-detail' student.id %}" class="button small">Edit Info</a></td>
 <!-- <td class="hidden-xs">{% if student.medical_conditions %}Yes{% else %}No{% endif %}</td> -->
 <!-- <td class="hidden-xs">{% if student.medications %}Yes{% else %}No{% endif %}</td> -->
 <td class="text-right"><a href="{% url 'student-detail' student.id %}" class="button ">Edit Info</a></td>
 </tr>
 {% endfor %}
 </tbody>
Expand All@@ -57,6 +36,29 @@ <h2 class="title text-tertiary">Students</h2>
 {% endif %}
</section>

<section class="margin-top-3">
 <h2 class="title text-primary">Your Profile</h2>
 <p>Joined on {{ guardian.user.date_joined|naturalday|capfirst }}</p>

 <form id="profile_form" enctype="multipart/form-data" action="" method="post">
 {% csrf_token %}
 <div class="grid-x grid-margin-x">
 <div class="cell medium-6">{% bootstrap_field user_form.first_name %}</div>
 <div class="cell medium-6">{% bootstrap_field user_form.last_name %}</div>
 <div class="cell medium-6">{% bootstrap_field form.phone %}</div>
 <div class="cell medium-6">{% bootstrap_field form.zip %}</div>
 <div class="cell medium-6">{% bootstrap_field form.birthday %}</div>
 <div class="cell medium-6">{% bootstrap_field form.gender %}</div>
 <div class="cell medium-6">{% bootstrap_field form.race_ethnicity %}</div>
 </div>
 {% buttons %}
 <button type="submit" class="button">Save</button>
 {% endbuttons %}
 </form>
</section>



<section class="margin-top-3">
 <h2 class="title text-secondary">Upcoming Classes</h2>

Expand Down

246 changes: 152 additions & 94 deletions
accounts/views.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,17 +41,24 @@ class LoginView(MetadataMixin, AllAuthLoginView):


@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
class GuardianAccountHomeView(MetadataMixin, TemplateView):
 template_name = "account/guardian/home.html"
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 guardian = get_object_or_404(Guardian, user=self.request.user)
 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
 ).exists()

 if students == False:
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 messages.error(
 self.request,
 "Tell us a little about yourself before going on account.",
 "Please add at least one student to your account.",
 )
 return redirect("welcome")

Expand All@@ -67,62 +74,11 @@ def get_context_data(self, **kwargs):

 context["user"] = self.request.user

 if self.request.user.role == "mentor":
 return {**context, **self.get_context_data_for_mentor()}

 if self.request.user.role == "guardian":
 return {**context, **self.get_context_data_for_guardian()}

 return context

 def get_context_data_for_mentor(self):
 mentor = get_object_or_404(Mentor, user=self.request.user)

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 guardian = get_object_or_404(
 Guardian,
 user=self.request.user,
 )

 upcoming_sessions = orders.filter(is_active=True, session__start_date__gte=timezone.now()).order_by(
 "session__start_date"
 )

 past_sessions = orders.filter(is_active=True, session__start_date__lte=timezone.now()).order_by(
 "session__start_date"
 )

 meeting_orders = MeetingOrder.objects.select_related().filter(mentor=mentor)

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now(),
 ).order_by("meeting__start_date")

 account_complete = False

 if (
 mentor.first_name
 and mentor.last_name
 and mentor.avatar
 and mentor.background_check
 and past_sessions.count() > 0
 ):
 account_complete = True

 return {
 "mentor": mentor,
 "orders": orders,
 "upcoming_sessions": upcoming_sessions,
 "past_sessions": past_sessions,
 "meeting_orders": meeting_orders,
 "upcoming_meetings": upcoming_meetings,
 "account_complete": account_complete,
 }

 def get_context_data_for_guardian(self):
 guardian = get_object_or_404(Guardian, user=self.request.user)

 students = Student.objects.filter(
 is_active=True,
 guardian=guardian,
Expand All@@ -142,30 +98,20 @@ def get_context_data_for_guardian(self):
 session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 return {
 "guardian": guardian,
 "students": students,
 "student_orders": student_orders,
 "upcoming_orders": upcoming_orders,
 "past_orders": past_orders,
 context = {
 **context,
 **{
 "guardian": guardian,
 "students": students,
 "student_orders": student_orders,
 "upcoming_orders": upcoming_orders,
 "past_orders": past_orders,
 },
 }

 def get(self, *args, **kwargs):
 if self.request.user.role == "mentor":
 return self.get_for_mentor(**kwargs)

 if self.request.user.role == "guardian":
 return self.get_for_guardian(**kwargs)

 def get_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, "account/mentor/home.html", context)
 return context

 def get_for_guardian(self, **kwargs):
 def get(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = GuardianForm(instance=context["guardian"])
Expand All@@ -174,20 +120,19 @@ def get_for_guardian(self, **kwargs):
 return render(self.request, "account/guardian/home.html", context)

 def post(self, *args, **kwargs):
 if self.request.user.role == "mentor":
 return self.post_for_mentor(**kwargs)

 if self.request.user.role == "guardian":
 return self.post_for_guardian(**kwargs)

 def post_for_mentor(self, **kwargs):
 context = self.get_context_data(**kwargs)

mentor = context["mentor"]
guardian = context["guardian"]

 form = MentorForm(self.request.POST, self.request.FILES, instance=mentor)
 form = GuardianForm(
 self.request.POST,
 instance=guardian,
 )

 user_form = CDCModelForm(self.request.POST, self.request.FILES, instance=mentor.user)
 user_form = CDCModelForm(
 self.request.POST,
 instance=guardian.user,
 )

 if form.is_valid() and user_form.is_valid():
 form.save()
Expand All@@ -202,16 +147,105 @@ def post_for_mentor(self, **kwargs):
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, "account/guardian/home.html", context)


@method_decorator(login_required, name="dispatch")
class MentorAccountHomeView(MetadataMixin, TemplateView):
 template_name = "account/mentor/home.html"
 title = "My Account | We All Code"

 def get_context_data(self, **kwargs):
 context = super().get_context_data(**kwargs)

 if "highlight" in self.request.GET:
 context["highlight"] = self.request.GET["highlight"]
 else:
 context["highlight"] = False

 context["user"] = self.request.user

 mentor = get_object_or_404(
 Mentor,
 user=self.request.user,
 )

 orders = MentorOrder.objects.select_related().filter(
 is_active=True,
 mentor=mentor,
 )

 upcoming_sessions = orders.filter(
 is_active=True,
 session__start_date__gte=timezone.now(),
 ).order_by("session__start_date")

 past_sessions = orders.filter(
 is_active=True,
 session__start_date__lte=timezone.now(),
 ).order_by("session__start_date")

 meeting_orders = MeetingOrder.objects.select_related().filter(
 mentor=mentor,
 )

 upcoming_meetings = meeting_orders.filter(
 is_active=True,
 meeting__is_public=True,
 meeting__end_date__gte=timezone.now(),
 ).order_by(
 "meeting__start_date",
 )

 account_complete = False

 if (
 mentor.first_name
 and mentor.last_name
 and mentor.avatar
 and mentor.background_check
 and past_sessions.count() > 0
 ):
 account_complete = True

 context = {
 **context,
 **{
 "mentor": mentor,
 "orders": orders,
 "upcoming_sessions": upcoming_sessions,
 "past_sessions": past_sessions,
 "meeting_orders": meeting_orders,
 "upcoming_meetings": upcoming_meetings,
 "account_complete": account_complete,
 },
 }
 return context

 def get(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

 context["form"] = MentorForm(instance=context["mentor"])
 context["user_form"] = CDCModelForm(instance=context["mentor"].user)

 return render(self.request, "account/mentor/home.html", context)

 def post_for_guardian(self, **kwargs):
 def post(self, *args, **kwargs):
 context = self.get_context_data(**kwargs)

guardian = context["guardian"]
mentor = context["mentor"]

 form = GuardianForm(self.request.POST, instance=guardian)
 form = MentorForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor,
 )

 user_form = CDCModelForm(self.request.POST, instance=guardian.user)
 user_form = CDCModelForm(
 self.request.POST,
 self.request.FILES,
 instance=mentor.user,
 )

 if form.is_valid() and user_form.is_valid():
 form.save()
Expand All@@ -226,4 +260,28 @@ def post_for_guardian(self, **kwargs):
 context["form"] = form
 context["user_form"] = user_form

 return render(self.request, "account/guardian/home.html", context)
 return render(self.request, "account/mentor/home.html", context)


@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
 title = "My Account | We All Code"

 def dispatch(self, *args, **kwargs):
 if not self.request.user.role:
 if "next" in self.request.GET:
 return redirect(f"{reverse('welcome')}?next={self.request.GET['next']}")
 else:
 messages.warning(
 self.request,
 "Tell us a little about yourself before going on account.",
 )
 return redirect("welcome")

 if self.request.user.role == "guardian":
 return GuardianAccountHomeView.as_view()(self.request)

 if self.request.user.role == "mentor":
 return MentorAccountHomeView.as_view()(self.request)

 return super().dispatch(*args, **kwargs)
Loading