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

Compare commits

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

1 Commits
master ... revert-43b

Author SHA1 Message Date
Alexander Hosking
6ed093fcff Revert "Improve current cycle time" 
This reverts commit 43b2a1d6bb
 2022-04-30 05:42:33 +00:00
6 changed files with 24 additions and 94 deletions
Show Stats Expand all files Collapse all files

35
.drone.yml
View File

@ -1,35 +0,0 @@
kind: pipeline
type: docker
name: build
steps:
- name: build
image: python:3-buster
commands:
- export PYTHONPATH=.
- export FLASK_APP=period
- apt-get update -qy
- apt-get install -y python3-dev python3-pip
- pip3 install --upgrade pip
- pip3 install --upgrade setuptools
- pip3 install Flask gunicorn pytest pytest-cov
- pip3 install pendulum
---
kind: pipeline
type: docker
name: test
steps:
- name: test
image: python:3-buster
commands:
- export PYTHONPATH=.
- export FLASK_APP=period
- apt-get update -qy
- apt-get install -y python3-dev python3-pip
- pip3 install --upgrade pip
- pip3 install --upgrade setuptools
- pip3 install Flask gunicorn pytest pytest-cov
- pip3 install pendulum
- pytest tests --cov --cov-report term --cov-report html --junitxml=report.xml

25
period/cycles.py
View File

@ -17,7 +17,7 @@ def index():
db = get_db() db = get_db()
current_cycle = db.execute('SELECT * from cycle ORDER BY id DESC LIMIT 1').fetchone() current_cycle = db.execute('SELECT * from cycle ORDER BY id DESC LIMIT 1').fetchone()
start_time = pendulum.parse(current_cycle['start_time']) start_time = pendulum.parse(current_cycle['start_time'])
cycle_length = ((pendulum.now() - start_time ).days) +1 cycle_length = (pendulum.now() - start_time ).days
db.execute( db.execute(
'UPDATE cycle SET cycle_length = ?' 'UPDATE cycle SET cycle_length = ?'
@ -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
@ -151,16 +151,15 @@ def cycle_math():
for num, cycle in enumerate(all_cycles): for num, cycle in enumerate(all_cycles):
# http://127.0.0.1:5000/cycle_math # http://127.0.0.1:5000/cycle_math
# cycle length = next start - this start # cycle length = next start - this start
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
cycle_length = (next_start - this_start).days +1 db.execute(
db.execute( 'UPDATE cycle SET cycle_length = ?'
'UPDATE cycle SET cycle_length = ?' ' WHERE id = ?',
' WHERE id = ?', (cycle_length, cycle['id'])
(cycle_length, cycle['id']) )
) db.commit()
db.commit()
return redirect(url_for('cycles.index')) return redirect(url_for('cycles.index'))

6
period/templates/base.html
View File

@ -15,7 +15,7 @@
margin: 30px 0; margin: 30px 0;
} }
.table-wrapper { .table-wrapper {
min-width: 400px; /* min-width: 1000px; */
background: #fff; background: #fff;
padding: 20px 25px; padding: 20px 25px;
border-radius: 3px; border-radius: 3px;
@ -230,12 +230,12 @@ table.table .avatar {
</style> </style>
</head> </head>
<body> <body>
<!-- <nav class="navbar navbar-expand-lg navbar-light bg-light"> <nav class="navbar navbar-expand-lg navbar-light bg-light">
<div class="container-fluid"> <div class="container-fluid">
<a class="navbar-brand" href="#">Period</a> <a class="navbar-brand" href="#">Period</a>
<a class="btn btn-primary" href="{{ url_for('cycles.create') }}">New Cycle</a> <a class="btn btn-primary" href="{{ url_for('cycles.create') }}">New Cycle</a>
</div> </div>
</nav> --> </nav>
</nav> </nav>
<section class="content"> <section class="content">
<header> <header>

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

@ -1,31 +1,15 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% block header %}
<h1>{% block title %}New Cycle{% endblock %}</h1>
{% endblock %}
{% block content %} {% 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 %}
<h2>{% block title %}New Cycle{% endblock %}</h2>
{% endblock %}
</div>
<div class="col-sm-6">
<a class="btn btn-primary" href="{{ url_for('cycles.create') }}">New Cycle</a>
</div>
</div>
</div>
<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 %}

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

@ -13,9 +13,6 @@
<h2>{% block title %}Cycles{% endblock %}</h2> <h2>{% block title %}Cycles{% endblock %}</h2>
{% endblock %} {% endblock %}
</div> </div>
<div class="col-sm-6">
<a class="btn btn-primary" href="{{ url_for('cycles.create') }}">New Cycle</a>
</div>
</div> </div>
</div> </div>
{% for cycle in cycles %} {% for cycle in cycles %}
@ -24,7 +21,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 %}

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

@ -1,28 +1,13 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% block header %}
<h1>{% block title %}Edit Cycle{% endblock %}</h1>
{% endblock %}
{% block content %} {% 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 %}
<h2>{% block title %}Edit Cycle{% endblock %}</h2>
{% endblock %}
</div>
<div class="col-sm-6">
<a class="btn btn-primary" href="{{ url_for('cycles.create') }}">New Cycle</a>
</div>
</div>
</div>
<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">