Correct Current Cycle and add styling to new/update

Update Math on Cycle Length
Add drone pipeline to mimic Gitlab
2022-08-12 00:20:37 -04:00 · 2022-08-12 00:20:19 -04:00 · 2022-08-03 22:08:54 -04:00 · 2022-05-08 14:51:10 -04:00 · 2022-05-08 14:51:05 -04:00 · 2022-04-30 05:44:35 +00:00
6 changed files with 94 additions and 24 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -0,0 +1,35 @@
+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
--- a/period/cycles.py
+++ b/period/cycles.py
@ -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
+    cycle_length = ((pendulum.now() - start_time ).days) +1

    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
+            cycle_length = (end_time - start_time).days +1
        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
+                cycle_length = (end_time - start_time).days + 1
        else:
            cycle_length = (pendulum.now() - start_time).days

@ -151,9 +151,10 @@ 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
+            cycle_length = (next_start - this_start).days +1
            db.execute(
                'UPDATE cycle SET cycle_length = ?'
                ' WHERE id = ?',
--- a/period/templates/base.html
+++ b/period/templates/base.html
@ -15,7 +15,7 @@
      margin: 30px 0;
  }
 .table-wrapper {
-  /* min-width: 1000px; */
+  min-width: 400px;
      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>
--- a/period/templates/cycle/create.html
+++ b/period/templates/cycle/create.html
@ -1,15 +1,31 @@
 {% 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 %}
--- a/period/templates/cycle/index.html
+++ b/period/templates/cycle/index.html
@ -13,6 +13,9 @@
            <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 %}
@ -21,7 +24,7 @@
                <h5 class="card-title">
                  {% if cycle['cycle_length'] %}
                    {% if loop.first %}
-                      Day <b>{{ cycle['cycle_length'] }}</b>
+                      Day <b>{{ cycle['cycle_length'] - 1 }}</b>
                    {% else %}
                      <b>{{ cycle['cycle_length'] }}</b> days.
                    {% endif %}
--- a/period/templates/cycle/update.html
+++ b/period/templates/cycle/update.html
@ -1,13 +1,28 @@
 {% 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">
Author	SHA1	Message	Date
Alexander Hosking	ebee2d514c	Correct Current Cycle and add styling to new/update All checks were successful continuous-integration/drone/push Build is passing Details	2022-08-12 00:20:37 -04:00
Alexander Hosking	fa7d46623e	Update Math on Cycle Length	2022-08-12 00:20:19 -04:00
Alexander Hosking	87f936c331	Add drone pipeline to mimic Gitlab Some checks failed continuous-integration/drone/push Build is failing Details continuous-integration/drone Build is passing Details	2022-08-03 22:08:54 -04:00
Alexander Hosking	d69001d72d	Merge branch 'master' of git.ahoskingit.com:family/period	2022-05-08 14:51:10 -04:00
Alexander Hosking	6e9a78029b	Remove Nav Bar	2022-05-08 14:51:05 -04:00
Alexander Hosking	16ad5e3a98	Merge branch 'revert-7d6a2e0a' into 'master' Revert "Calculate all Cycles..." See merge request family/period!1	2022-04-30 05:44:35 +00:00
Alexander Hosking	65b925f90d	Revert "Calculate all Cycles..." This reverts commit `7d6a2e0a78`	2022-04-30 05:43:10 +00:00