Compare commits
1 Commits
master
...
revert-43b
| Author | SHA1 | Date | |
|---|---|---|---|
| 6ed093fcff |
35
.drone.yml
35
.drone.yml
@ -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
|
||||
@ -17,7 +17,7 @@ def index():
|
||||
db = get_db()
|
||||
current_cycle = db.execute('SELECT * from cycle ORDER BY id DESC LIMIT 1').fetchone()
|
||||
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(
|
||||
'UPDATE cycle SET cycle_length = ?'
|
||||
@ -49,7 +49,7 @@ def create():
|
||||
error = "You must provide a start date"
|
||||
|
||||
if end_time > start_time:
|
||||
cycle_length = (end_time - start_time).days +1
|
||||
cycle_length = (end_time - start_time).days
|
||||
else:
|
||||
cycle_length = (pendulum.now() - start_time).days
|
||||
|
||||
@ -105,7 +105,7 @@ def update(id):
|
||||
error = "You must provide a start date"
|
||||
|
||||
if end_time > start_time:
|
||||
cycle_length = (end_time - start_time).days + 1
|
||||
cycle_length = (end_time - start_time).days
|
||||
else:
|
||||
cycle_length = (pendulum.now() - start_time).days
|
||||
|
||||
@ -151,16 +151,15 @@ def cycle_math():
|
||||
for num, cycle in enumerate(all_cycles):
|
||||
# http://127.0.0.1:5000/cycle_math
|
||||
# cycle length = next start - this start
|
||||
if num > 0:
|
||||
this_start = pendulum.parse(cycle['start_time'])
|
||||
next_start = pendulum.parse(all_cycles[num-1]['start_time'])
|
||||
cycle_length = (next_start - this_start).days +1
|
||||
db.execute(
|
||||
'UPDATE cycle SET cycle_length = ?'
|
||||
' WHERE id = ?',
|
||||
(cycle_length, cycle['id'])
|
||||
)
|
||||
db.commit()
|
||||
this_start = pendulum.parse(cycle['start_time'])
|
||||
next_start = pendulum.parse(all_cycles[num-1]['start_time'])
|
||||
cycle_length = (next_start - this_start).days
|
||||
db.execute(
|
||||
'UPDATE cycle SET cycle_length = ?'
|
||||
' WHERE id = ?',
|
||||
(cycle_length, cycle['id'])
|
||||
)
|
||||
db.commit()
|
||||
|
||||
|
||||
return redirect(url_for('cycles.index'))
|
||||
@ -15,7 +15,7 @@
|
||||
margin: 30px 0;
|
||||
}
|
||||
.table-wrapper {
|
||||
min-width: 400px;
|
||||
/* min-width: 1000px; */
|
||||
background: #fff;
|
||||
padding: 20px 25px;
|
||||
border-radius: 3px;
|
||||
@ -230,12 +230,12 @@ table.table .avatar {
|
||||
</style>
|
||||
</head>
|
||||
<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">
|
||||
<a class="navbar-brand" href="#">Period</a>
|
||||
<a class="btn btn-primary" href="{{ url_for('cycles.create') }}">New Cycle</a>
|
||||
</div>
|
||||
</nav> -->
|
||||
</nav>
|
||||
</nav>
|
||||
<section class="content">
|
||||
<header>
|
||||
|
||||
@ -1,31 +1,15 @@
|
||||
{% extends 'base.html' %}
|
||||
|
||||
{% block header %}
|
||||
<h1>{% block title %}New Cycle{% endblock %}</h1>
|
||||
{% endblock %}
|
||||
|
||||
{% 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">
|
||||
<label for="start_time">Start Time</label>
|
||||
<input name="start_time" id="title" value="{{ request.form['start_time'] }}" required type="date">
|
||||
<br><br>
|
||||
<label for="end_time">End Time</label>
|
||||
<input name="end_time" id="end_time" value="{{ request.form['end_time'] }}" type="date">
|
||||
<br>
|
||||
<input type="submit" value="Save">
|
||||
</form>
|
||||
{% endblock %}
|
||||
@ -13,9 +13,6 @@
|
||||
<h2>{% block title %}Cycles{% 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>
|
||||
{% for cycle in cycles %}
|
||||
@ -24,7 +21,7 @@
|
||||
<h5 class="card-title">
|
||||
{% if cycle['cycle_length'] %}
|
||||
{% if loop.first %}
|
||||
Day <b>{{ cycle['cycle_length'] - 1 }}</b>
|
||||
Day <b>{{ cycle['cycle_length'] }}</b>
|
||||
{% else %}
|
||||
<b>{{ cycle['cycle_length'] }}</b> days.
|
||||
{% endif %}
|
||||
|
||||
@ -1,28 +1,13 @@
|
||||
{% extends 'base.html' %}
|
||||
|
||||
{% block header %}
|
||||
<h1>{% block title %}Edit Cycle{% endblock %}</h1>
|
||||
{% endblock %}
|
||||
|
||||
{% 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">
|
||||
<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">
|
||||
<br>
|
||||
<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 type="submit" value="Save">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user