feat(timestamps): display times based on browser timezone (#119)

drahamim · Mar 3, 2024 · 7d761ef · 7d761ef
1 parent ee0e880
commit 7d761ef
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 11 deletions.
diff --git a/src/invenflask/app.py b/src/invenflask/app.py
@@ -9,21 +9,33 @@
 from importlib.metadata import version, PackageNotFoundError
 from sqlalchemy.exc import IntegrityError
 from werkzeug.utils import secure_filename
+from flask_moment import Moment
 
 from .models import Asset, Staff, Checkout, History, db
 
+
 app = Flask(__name__)
 app.config['SQLALCHEMY_DATABASE_URI'] = os.getenv(
     'DATABASE_URI', 'sqlite:////tmp/test.db')
 bootstrap = Bootstrap5(app)
 app.config['TEMPLATES_AUTO_RELOAD'] = True
 app.config['SECRET_KEY'] = os.urandom(24)
 app.config['upload_folder'] = 'uploads'
+moment = Moment(app)
 
 # Init DB
 db.init_app(app)
 migrate = Migrate(app, db)
 
+# @app.context
+# def inject_settings():
+#     if not db.session.query(GlobalSet).filter(GlobalSet.settingid == "timezone"):
+#         db.session.add(GlobalSet(settingid="timezone", setting="UTC"))
+#         db.session.commit()
+#     else:
+#         print("timezone already set")
+#     return dict(settings=db.session.query(GlobalSet).all())
+
 
 @app.context_processor
 def get_version():

diff --git a/src/invenflask/templates/base.html b/src/invenflask/templates/base.html
@@ -48,6 +48,10 @@
                         <a class="nav-link" href="{{ url_for('history') }}">History
                         </a>
                     </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="{{ url_for('settings') }}">Settings
+                        </a>
+                    </li>
                 </ul>
                 <!-- <form class="d-flex">
                 <input class="form-control me-sm-2" type="search" placeholder="Search">
@@ -61,6 +65,7 @@
 </head>
 
 <body {{ load_checkout|safe if load_checkout is not none else 'NONE'  }} >
+    {{moment.include_moment()}}
     <hr>
     <div class="content">
         {% with messages = get_flashed_messages(with_categories=true) %}

diff --git a/src/invenflask/templates/history.html b/src/invenflask/templates/history.html
@@ -8,8 +8,8 @@
         <th>staff ID</th>
         <th>Department</th>
         <th>Division</th>
-        <th>CheckoutTime</th>
-        <th>ReturnTime</th>
+        <th><div>Checkout Time</div><div>Browser Local</div></th>
+        <th><div>Return Time</div><div>Browser Local</div></th>
       </tr>
     </thead>
     <tbody>
@@ -19,8 +19,8 @@
           <td>{{ asset.staffid }}</td>
           <td>{{ asset.department }}</td>
           <td>{{ asset.division }}</td>
-          <td>{{ asset.checkouttime }}</td>
-          <td>{{ asset.returntime }}</td>
+          <td>{{ moment(asset.checkouttime, local=True).format('LLL') }}</td>
+          <td>{{ moment(asset.returntime, local=True).format('LLL') }}</td>
           </td>
         </tr>
       {% endfor %}

diff --git a/src/invenflask/templates/index.html b/src/invenflask/templates/index.html
@@ -39,7 +39,7 @@ <h4>Checked Out Assets</h4>
           <td>{{ item.assetid }}</td>
           <td>{{ item.staffid }}</td>
           <td>{{ item.department }}</td>
-          <td>{{ item.timestamp }}</td>
+          <td>{{ moment(item.timestamp, local=True).format('LLL') }}</td>
           </td>
         </tr>
       {% endfor %}

diff --git a/src/invenflask/templates/single_history.html b/src/invenflask/templates/single_history.html
@@ -39,7 +39,7 @@ <h4>Current Assets</h4>
     {% for item in current %}
     <tr>
       <td>{{ item.assetid }}</td>
-      <td>{{ item.timestamp }}</td>
+      <td>{{ moment(item.timestamp, local=True).format('LLL') }}</td>
     </tr>
     {% endfor %}
   </tbody>
@@ -58,8 +58,8 @@ <h4>History</h4>
     {% for item in history %}
     <tr>
       <td>{{ item.assetid }}</td>
-      <td>{{ item.checkouttime }}</td>
-      <td>{{ item.returntime }}</td>
+      <td>{{ moment(item.checkouttime, local=True).format('LLL') }}</td>
+      <td>{{ moment(item.returntime, local=True).format('LLL') }}</td>
     </tr>
     {% endfor %}
   </tbody>
@@ -100,7 +100,7 @@ <h1> Asset History </h1>
     <tr>
       <td>{{ item.staffid }}</td>
       <td>{{ item.department }}</td>
-      <td>{{ item.timestamp }}</td>
+      <td>{{ moment(item.timestamp, local=True).format('LLL') }}</td>
     </tr>
     {% endfor %}
   </tbody>
@@ -123,8 +123,8 @@ <h1> Asset History </h1>
       <td>{{ item.staffid }}</td>
       <td>{{ item.department }}</td>
       <td>{{ item.division }}</td>
-      <td>{{ item.checkouttime }}</td>
-      <td>{{ item.returntime }}</td>
+      <td>{{ moment(item.checkouttime, local=True).format('LLL') }}</td>
+      <td>{{ moment(item.returntime, local=True).format('LLL') }}</td>
     </tr>
     {% endfor %}
   </tbody>