Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion neuropy/neuropy/templates/neuropy/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h4>Amos Bolder</h4>
<div>
<h4>Claire Gatenby</h4>
<div><img src="{% static 'neuropy/Claire.jpg' %}" class="img-responsive" style="width:100%" alt="Image"></div>
<div>I am a born and bred Australian who made the wild decision to quit my job and move to Seattle where I am learning how to code. I dream of using my past life as a scientist and my new skills as a developer to move into bioinformatics. I love cats, staying active, traveling, the outdoors and taking photos. I am Python developer.</div>
<div>I am a born and bred Australian who made the wild decision to quit my job and move to Seattle where I am learning how to code. I dream of using my past life as a scientist and my new skills as a developer to move into bioinformatics. I love cats, staying active, travelling, the outdoors and taking photos. I am Python developer.</div>
</div>
</div>
<div class="col-sm-3">
Expand Down
1 change: 0 additions & 1 deletion neuropy/neuropy/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@


urlpatterns = [
# url(r'^oauth2/', include(django_util_site.urls)),
url(r'^oauth2callback', auth_return),
url(r'^admin/', admin.site.urls),
url(r'^$', TemplateView.as_view(template_name="neuropy/home.html"),
Expand Down
1 change: 0 additions & 1 deletion neuropy/todo/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -588,5 +588,4 @@ def test_schedule_view_returns(self):
session.save()
html = self.client.get(reverse_lazy('create_sched')).content
parsed_html = BeautifulSoup(html, "html5lib")
import pdb; pdb.set_trace()
self.assertTrue(len(parsed_html.find_all('div')) == 10)
4 changes: 0 additions & 4 deletions neuropy/todo/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from django.urls import reverse_lazy
from django.views.generic import CreateView, UpdateView, ListView, DetailView, TemplateView
from django.contrib.auth.mixins import (LoginRequiredMixin,
# PermissionRequiredMixin,
UserPassesTestMixin,
)
from todo.models import Todo
Expand Down Expand Up @@ -47,7 +46,6 @@ def form_valid(self, form):
class EditTodo(LoginRequiredMixin, UpdateView):
"""Edit todo."""

# permission_required = "todo.change_todo"
login_required = True

model = Todo
Expand Down Expand Up @@ -149,7 +147,6 @@ def td(time):

drug = Medication.objects.get(name=drug_name)
peak_end = start_time + datetime.timedelta(hours=td(drug.peak_end))
# medium_start = start_time + datetime.timedelta(hours=td(drug.post_peak_medium_start))
easy_start = start_time + datetime.timedelta(hours=td(drug.post_peak_easy_start))

events_list = []
Expand Down Expand Up @@ -179,7 +176,6 @@ def td(time):
events_list.append(dict(priority_dict))

start_time = start_time + datetime.timedelta(hours=event.duration)
print('priority_dict: ', priority_dict)
return events_list


Expand Down