diff --git a/.DS_Store b/.DS_Store index 2fa6a40..9010bb4 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/assets_manage/templates/assets_manage/app/assets_manage.html b/assets_manage/templates/assets_manage/app/assets_manage.html index beaf8f3..d1e219a 100644 --- a/assets_manage/templates/assets_manage/app/assets_manage.html +++ b/assets_manage/templates/assets_manage/app/assets_manage.html @@ -33,7 +33,7 @@

Location Tracking

Status Monitoring in Asset Management

Status Monitoring is a crucial component of asset management that involves tracking and recording the operational state of assets throughout their lifecycle. This ensures that all assets, such as vehicles and machinery, are functioning efficiently and any issues are addressed promptly. Here's an overview of how status monitoring can be implemented and its significance

- View Vehicle Inventory + View Vehicle Status
diff --git a/blinklog/__pycache__/settings.cpython-312.pyc b/blinklog/__pycache__/settings.cpython-312.pyc index 0e97ba8..b5ae5a9 100644 Binary files a/blinklog/__pycache__/settings.cpython-312.pyc and b/blinklog/__pycache__/settings.cpython-312.pyc differ diff --git a/blinklog/__pycache__/urls.cpython-312.pyc b/blinklog/__pycache__/urls.cpython-312.pyc index 305b300..0fa88d0 100644 Binary files a/blinklog/__pycache__/urls.cpython-312.pyc and b/blinklog/__pycache__/urls.cpython-312.pyc differ diff --git a/blinklog/__pycache__/wsgi.cpython-312.pyc b/blinklog/__pycache__/wsgi.cpython-312.pyc index f254ee4..80689a3 100644 Binary files a/blinklog/__pycache__/wsgi.cpython-312.pyc and b/blinklog/__pycache__/wsgi.cpython-312.pyc differ diff --git a/blinklog/settings.py b/blinklog/settings.py index 916e3a1..3cb4f9f 100644 --- a/blinklog/settings.py +++ b/blinklog/settings.py @@ -48,6 +48,7 @@ # custom apps 'assets_manage', + 'maintain', ] MIDDLEWARE = [ diff --git a/blinklog/urls.py b/blinklog/urls.py index cb188bf..64c9f60 100644 --- a/blinklog/urls.py +++ b/blinklog/urls.py @@ -28,6 +28,7 @@ # custom apps path('assets_manage/',include('assets_manage.urls')), + path('maintain/',include('maintain.urls')), ] urlpatterns += static(settings.STATIC_URL,document_root=settings.STATIC_ROOT) diff --git a/core/static/core/css/welcome.css b/core/static/core/css/welcome.css index a00c5c3..7f7a937 100644 --- a/core/static/core/css/welcome.css +++ b/core/static/core/css/welcome.css @@ -1,6 +1,6 @@ @font-face { font-family: 'CustomFont'; - src: url('../fonts/Gazpacho.ttf') format('truetype'); + src: url('../') format('truetype'); } /* navbar */ .navbar{ diff --git a/core/static/core/image/settings.svg b/core/static/core/image/settings.svg new file mode 100644 index 0000000..5708adb --- /dev/null +++ b/core/static/core/image/settings.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core/templates/core/app/welcome.html b/core/templates/core/app/welcome.html index 9427054..8479918 100644 --- a/core/templates/core/app/welcome.html +++ b/core/templates/core/app/welcome.html @@ -26,11 +26,16 @@

IMC Inventory

-
-
- -
-
+ +
+
+ Maintenance Management +
+ +
+
+
+
diff --git a/maintain/__init__.py b/maintain/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/maintain/__pycache__/__init__.cpython-312.pyc b/maintain/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000..9a5ce93 Binary files /dev/null and b/maintain/__pycache__/__init__.cpython-312.pyc differ diff --git a/maintain/__pycache__/admin.cpython-312.pyc b/maintain/__pycache__/admin.cpython-312.pyc new file mode 100644 index 0000000..37c99dd Binary files /dev/null and b/maintain/__pycache__/admin.cpython-312.pyc differ diff --git a/maintain/__pycache__/apps.cpython-312.pyc b/maintain/__pycache__/apps.cpython-312.pyc new file mode 100644 index 0000000..93f829a Binary files /dev/null and b/maintain/__pycache__/apps.cpython-312.pyc differ diff --git a/maintain/__pycache__/models.cpython-312.pyc b/maintain/__pycache__/models.cpython-312.pyc new file mode 100644 index 0000000..5c09249 Binary files /dev/null and b/maintain/__pycache__/models.cpython-312.pyc differ diff --git a/maintain/__pycache__/urls.cpython-312.pyc b/maintain/__pycache__/urls.cpython-312.pyc new file mode 100644 index 0000000..a8b48ce Binary files /dev/null and b/maintain/__pycache__/urls.cpython-312.pyc differ diff --git a/maintain/__pycache__/views.cpython-312.pyc b/maintain/__pycache__/views.cpython-312.pyc new file mode 100644 index 0000000..5d4b139 Binary files /dev/null and b/maintain/__pycache__/views.cpython-312.pyc differ diff --git a/maintain/admin.py b/maintain/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/maintain/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/maintain/apps.py b/maintain/apps.py new file mode 100644 index 0000000..a2fd95f --- /dev/null +++ b/maintain/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class MaintainConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'maintain' diff --git a/maintain/migrations/__init__.py b/maintain/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/maintain/migrations/__pycache__/__init__.cpython-312.pyc b/maintain/migrations/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000..b2bdd37 Binary files /dev/null and b/maintain/migrations/__pycache__/__init__.cpython-312.pyc differ diff --git a/maintain/models.py b/maintain/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/maintain/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/maintain/static/maintain/css/maintain.css b/maintain/static/maintain/css/maintain.css new file mode 100644 index 0000000..25349f7 --- /dev/null +++ b/maintain/static/maintain/css/maintain.css @@ -0,0 +1,21 @@ +.view_list{ + text-decoration: none; + border: 1px solid grey; + padding: 5px 10px; + background-color: white; + border-radius: 5px; + color: #236aa9; + font-weight: 600; +} +.view_list:hover{ + background-color: #236aa9; + color: white; +} +.vehicle_para{ + padding: 20px; +} +.vehicle_para_img{ + display: flex; + justify-content: right; + align-items: baseline; +} \ No newline at end of file diff --git a/maintain/static/maintain/image/history.svg b/maintain/static/maintain/image/history.svg new file mode 100644 index 0000000..775129c --- /dev/null +++ b/maintain/static/maintain/image/history.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/maintain/static/maintain/image/mail.svg b/maintain/static/maintain/image/mail.svg new file mode 100644 index 0000000..6c01c1d --- /dev/null +++ b/maintain/static/maintain/image/mail.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/maintain/static/maintain/image/manage.svg b/maintain/static/maintain/image/manage.svg new file mode 100644 index 0000000..c3184a8 --- /dev/null +++ b/maintain/static/maintain/image/manage.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/maintain/static/maintain/image/repair.svg b/maintain/static/maintain/image/repair.svg new file mode 100644 index 0000000..7f6f0da --- /dev/null +++ b/maintain/static/maintain/image/repair.svg @@ -0,0 +1,6 @@ + + + +repair + + \ No newline at end of file diff --git a/maintain/static/maintain/js/maintain.js b/maintain/static/maintain/js/maintain.js new file mode 100644 index 0000000..e69de29 diff --git a/maintain/templates/maintain/app/maintain.html b/maintain/templates/maintain/app/maintain.html new file mode 100644 index 0000000..12c606e --- /dev/null +++ b/maintain/templates/maintain/app/maintain.html @@ -0,0 +1,56 @@ +{% extends 'maintain/partial/base.html' %} +{% load static %} +{% block index %} + +
+
+
+
+

Automated Reminders

+

Set up automated reminders for routine maintenance tasks. Schedule periodic checks and alerts to ensure timely maintenance.

+ View Reminders +
+
+
+ +
+
+
+
+ +
+
+
+

Log Repair Activities

+

Track all repair activities including costs and downtime.Maintain records of repairs to monitor asset performance and costs.

+ View Activities +
+
+
+
+
+
+

Maintain Service History

+

Keep a detailed history of all maintenance and repairs performed on each asset.Access historical data for analysis and decision-making.

+ View History +
+
+
+ +
+
+
+
+ +
+
+
+

Manage Inventory

+

Track and manage inventory of equipment and parts.Monitor stock levels and manage orders to ensure availability.

+ View Inventory +
+
+
+
+ +{% endblock index %} diff --git a/maintain/templates/maintain/elements/script.html b/maintain/templates/maintain/elements/script.html new file mode 100644 index 0000000..4f2eacf --- /dev/null +++ b/maintain/templates/maintain/elements/script.html @@ -0,0 +1,3 @@ +{% load static %} + + \ No newline at end of file diff --git a/maintain/templates/maintain/elements/style.html b/maintain/templates/maintain/elements/style.html new file mode 100644 index 0000000..bcc9692 --- /dev/null +++ b/maintain/templates/maintain/elements/style.html @@ -0,0 +1,3 @@ +{% load static %} + + \ No newline at end of file diff --git a/maintain/templates/maintain/partial/base.html b/maintain/templates/maintain/partial/base.html new file mode 100644 index 0000000..cda9a18 --- /dev/null +++ b/maintain/templates/maintain/partial/base.html @@ -0,0 +1,15 @@ +{% extends 'core/partial/main-base.html' %} +{% load static %} + +{% block appstyling %} +{% include 'maintain/elements/style.html' %} +{% endblock appstyling %} + +{% block mainapp %} + {% block index %} + {% endblock index %} +{% endblock mainapp %} + +{% block appscripting %} +{% include 'maintain/elements/script.html' %} +{% endblock appscripting %} \ No newline at end of file diff --git a/maintain/tests.py b/maintain/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/maintain/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/maintain/urls.py b/maintain/urls.py new file mode 100644 index 0000000..468e41c --- /dev/null +++ b/maintain/urls.py @@ -0,0 +1,8 @@ +from django.urls import path +from maintain import views + +app_name='maintain' + +urlpatterns=[ + path('',views.maintain,name='maintain'), +] \ No newline at end of file diff --git a/maintain/views.py b/maintain/views.py new file mode 100644 index 0000000..ff7cb53 --- /dev/null +++ b/maintain/views.py @@ -0,0 +1,7 @@ +from django.shortcuts import render + +def maintain(request): + context={ + + } + return render(request,'maintain/app/maintain.html',context)