family/cycles
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Compare commits

base: family:ebee2d514c0e9bb6c949beaa802b181e0862a523
Branches Tags
family:master
family:revert-43b2a1d6
..
compare: family:87f936c331bb95d1991716ef5243864d0df84f6d
Branches Tags
family:master
family:revert-43b2a1d6

No commits in common. "ebee2d514c0e9bb6c949beaa802b181e0862a523" and "87f936c331bb95d1991716ef5243864d0df84f6d" have entirely different histories.
ebee2d514c ... 87f936c331

4 changed files with 13 additions and 44 deletions
Show Stats Expand all files Collapse all files

6
period/cycles.py
View File

@ -49,7 +49,7 @@ def create():
error = "You must provide a start date" error = "You must provide a start date"
if end_time > start_time: if end_time > start_time:
cycle_length = (end_time - start_time).days +1 cycle_length = (end_time - start_time).days
else: else:
cycle_length = (pendulum.now() - start_time).days cycle_length = (pendulum.now() - start_time).days
@ -105,7 +105,7 @@ def update(id):
error = "You must provide a start date" error = "You must provide a start date"
if end_time > start_time: if end_time > start_time:
cycle_length = (end_time - start_time).days + 1 cycle_length = (end_time - start_time).days
else: else:
cycle_length = (pendulum.now() - start_time).days cycle_length = (pendulum.now() - start_time).days
@ -154,7 +154,7 @@ def cycle_math():
if num > 0: if num > 0:
this_start = pendulum.parse(cycle['start_time']) this_start = pendulum.parse(cycle['start_time'])
next_start = pendulum.parse(all_cycles[num-1]['start_time']) next_start = pendulum.parse(all_cycles[num-1]['start_time'])
cycle_length = (next_start - this_start).days +1 cycle_length = (next_start - this_start).days
db.execute( db.execute(
'UPDATE cycle SET cycle_length = ?' 'UPDATE cycle SET cycle_length = ?'
' WHERE id = ?', ' WHERE id = ?',

20
period/templates/cycle/create.html
View File

@ -1,31 +1,15 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% block content %}
<div class="container-fluid">
<div class="table-responsive">
<div class="table-wrapper">
<div class="table-title">
<div class="row">
<div class="col-sm-6">
{% block header %} {% block header %}
<h2>{% block title %}New Cycle{% endblock %}</h2> <h1>{% block title %}New Cycle{% endblock %}</h1>
{% endblock %} {% endblock %}
</div>
<div class="col-sm-6">
<a class="btn btn-primary" href="{{ url_for('cycles.create') }}">New Cycle</a>
</div>
</div>
</div>
{% block content %}
<form method="post"> <form method="post">
<label for="start_time">Start Time</label> <label for="start_time">Start Time</label>
<input name="start_time" id="title" value="{{ request.form['start_time'] }}" required type="date"> <input name="start_time" id="title" value="{{ request.form['start_time'] }}" required type="date">
<br><br>
<label for="end_time">End Time</label> <label for="end_time">End Time</label>
<input name="end_time" id="end_time" value="{{ request.form['end_time'] }}" type="date"> <input name="end_time" id="end_time" value="{{ request.form['end_time'] }}" type="date">
<br>
<input type="submit" value="Save"> <input type="submit" value="Save">
</form> </form>
{% endblock %} {% endblock %}

2
period/templates/cycle/index.html
View File

@ -24,7 +24,7 @@
<h5 class="card-title"> <h5 class="card-title">
{% if cycle['cycle_length'] %} {% if cycle['cycle_length'] %}
{% if loop.first %} {% if loop.first %}
Day <b>{{ cycle['cycle_length'] - 1 }}</b> Day <b>{{ cycle['cycle_length'] }}</b>
{% else %} {% else %}
<b>{{ cycle['cycle_length'] }}</b> days. <b>{{ cycle['cycle_length'] }}</b> days.
{% endif %} {% endif %}

19
period/templates/cycle/update.html
View File

@ -1,28 +1,13 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% block content %}
<div class="container-fluid">
<div class="table-responsive">
<div class="table-wrapper">
<div class="table-title">
<div class="row">
<div class="col-sm-6">
{% block header %} {% block header %}
<h2>{% block title %}Edit Cycle{% endblock %}</h2> <h1>{% block title %}Edit Cycle{% endblock %}</h1>
{% endblock %} {% endblock %}
</div>
<div class="col-sm-6">
<a class="btn btn-primary" href="{{ url_for('cycles.create') }}">New Cycle</a>
</div>
</div>
</div>
{% block content %}
<form method="post"> <form method="post">
<label for="start_time">Start Time</label> <label for="start_time">Start Time</label>
<input name="start_time" id="title" value="{{ request.form['start_time'] or cycle['start_time'][:10] }}" required type="date"> <input name="start_time" id="title" value="{{ request.form['start_time'] or cycle['start_time'][:10] }}" required type="date">
<br>
<label for="end_time">End Time</label> <label for="end_time">End Time</label>
<input name="end_time" id="end_time" value="{{ request.form['end_time'] or cycle['end_time'][:10] if cycle['end_time'] is not none }}" type="date"> <input name="end_time" id="end_time" value="{{ request.form['end_time'] or cycle['end_time'][:10] if cycle['end_time'] is not none }}" type="date">
<input type="submit" value="Save"> <input type="submit" value="Save">