.gitignore

@@ -5,7 +5,6 @@ ordr3.sqlite
 ordr3.sqlite.backup
 ordr3_backup.sqlite
 production.ini
-mail/
 
 # ---> Python
 # Byte-compiled / optimized / DLL files

Makefile

@@ -1,4 +1,4 @@
-.PHONY: clean clean-test clean-pyc clean-build docs help serve
+.PHONY: clean clean-test clean-pyc clean-build docs help
 .DEFAULT_GOAL := help
 
 define BROWSER_PYSCRIPT
@@ -91,6 +91,3 @@ repo: prepareenv ## complete project setup with development environment and git
 	git push -u origin main --no-verify
 
 	.venv/bin/pre-commit install --install-hooks
-
-serve: 
-	.venv/bin/pserve --reload development.ini

ordr3/__init__.py

@@ -3,7 +3,7 @@
 A rewrite of our CPI ordering system.
 """
 
-__version__ = "1.3.0"
+__version__ = "1.2.0"
 
 
 from pyramid.config import Configurator

ordr3/models.py

@@ -8,11 +8,10 @@ VendorAggregate = namedtuple("VendorAggregate", ["name", "terms"])
 @enum.unique
 class OrderStatus(enum.Enum):
     OPEN = 1
-    FUNDED = 2
+    APPROVAL = 2
-    APPROVAL = 3
+    ORDERED = 3
-    ORDERED = 4
+    COMPLETED = 4
-    COMPLETED = 5
+    HOLD = 5
-    HOLD = 6
 
 
 @enum.unique

ordr3/scripts/migrate_to_1.3.0.sh

@@ -1,114 +0,0 @@
-#!/bin/sh
-cp ordr3.sqlite pre-1.3.0-ordr3.sqlite
-cat <<EOF | sqlite3 ordr3.sqlite
-
-CREATE TABLE
-  orders_1_3_0 (
-    id INTEGER NOT NULL,
-    cas_description TEXT NOT NULL,
-    catalog_nr TEXT NOT NULL,
-    vendor TEXT NOT NULL,
-    category VARCHAR(10) NOT NULL,
-    package_size TEXT NOT NULL,
-    unit_price FLOAT NOT NULL,
-    currency TEXT NOT NULL,
-    amount INTEGER NOT NULL,
-    account TEXT NOT NULL,
-    comment TEXT NOT NULL,
-    created_on DATETIME NOT NULL,
-    created_by TEXT,
-    status VARCHAR(9),
-    CONSTRAINT pk_orders PRIMARY KEY (id),
-    CONSTRAINT ck_orders_ordercategory CHECK (
-      category IN (
-        'DISPOSABLE',
-        'SOLVENT',
-        'CHEMICAL',
-        'BIOLAB',
-        'SYNTHESIS'
-      )
-    ),
-    CONSTRAINT ck_orders_orderstatus CHECK (
-      status IN (
-        'OPEN',
-        'FUNDED',
-        'APPROVAL',
-        'ORDERED',
-        'COMPLETED',
-        'HOLD'
-      )
-    )
-  );
-
-INSERT INTO orders_1_3_0 (
-  	id,
-    cas_description,
-    catalog_nr,
-    vendor,
-    category,
-    package_size,
-    unit_price,
-    currency,
-    amount,
-    account,
-    comment,
-    created_on,
-    created_by,
-    status)
-  SELECT 
-  	id,
-    cas_description,
-    catalog_nr,
-    vendor,
-    category,
-    package_size,
-    unit_price,
-    currency,
-    amount,
-    account,
-    comment,
-    created_on,
-    created_by,
-    status
-FROM orders;
-
-DROP TABLE orders;
-ALTER TABLE orders_1_3_0 RENAME TO orders;
-
-CREATE TABLE
-  logs_1_3_0 (
-    order_id INTEGER NOT NULL,
-    status VARCHAR(9) NOT NULL,
-    date DATETIME NOT NULL,
-    "by" TEXT NOT NULL,
-    CONSTRAINT pk_logs PRIMARY KEY (order_id, status, date),
-    CONSTRAINT fk_logs_order_id_orders FOREIGN KEY (order_id) REFERENCES orders (id),
-    CONSTRAINT ck_logs_orderstatus CHECK (
-      status IN (
-        'OPEN',
-        'FUNDED',
-        'APPROVAL',
-        'ORDERED',
-        'COMPLETED',
-        'HOLD'
-      )
-    )
-  );
-
-INSERT INTO logs_1_3_0 (
-  	order_id,
-    status,
-    date,
-    "by"
-    )
-  SELECT 
-    order_id,
-    status,
-    date,
-    "by"
-  FROM logs;
-
-DROP TABLE logs;
-ALTER TABLE logs_1_3_0 RENAME TO logs;
-
-EOF

ordr3/static/style.css

@@ -285,9 +285,3 @@ label.o3-form-copy:hover {
 .o3-consumables table .o3-consumable-cas .text-truncate {
     display:block;
     }
-
-.badge.badge-outline-primary {
-    background-color: transparent;
-    border-color: #007bff;
-    border-width: 1px;
-}

ordr3/templates/macros.jinja2

@@ -25,8 +25,6 @@
 {% macro status_label(status) -%}
     {% if status.name == "OPEN" %}
         <span class="badge badge-danger">open</span>
-    {% elif status.name == "FUNDED" %}
-        <span class="badge badge-info">funded</span>
     {% elif status.name == "APPROVAL" %}
         <span class="badge badge-primary">approval</span>
     {% elif status.name == "ORDERED" %}