diff --git a/interface/models.py b/interface/models.py index e7fc23a..ee9a755 100644 --- a/interface/models.py +++ b/interface/models.py @@ -102,7 +102,7 @@ def __str__(self): ## definition for storing the campus data files locations def set_upload_path(instance, filename): - return '/'.join(['campusData', f"{ datetime.datetime.today().strftime('%Y%m%d') }", instance.campus_name, filename]) + return '/'.join(['campusData', f"{ datetime.datetime.today().strftime('%Y%m%d') }", instance.campus_name.replace(' ', '_'), filename]) class campusData(models.Model): students_csv = models.FileField(upload_to=set_upload_path, null=True) @@ -136,9 +136,9 @@ def __str__(self): ## definition for storing the instantiation campus's file paths def set_instantiation_filePath(instance, filename): if filename != '': - return '/'.join(['instantiation', f"{ datetime.datetime.today().strftime('%Y%m%d') }", instance.inst_name.campus_name, filename]) + return '/'.join(['instantiation', f"{ datetime.datetime.today().strftime('%Y%m%d') }", instance.inst_name.campus_name.replace(' ', '_'), filename]) else: - return '/'.join(['instantiation', f"{ datetime.datetime.today().strftime('%Y%m%d') }", instance.inst_name.campus_name]) + return '/'.join(['instantiation', f"{ datetime.datetime.today().strftime('%Y%m%d') }", instance.inst_name.campus_name.replace(' ', '_')]) class campusInstantiation(models.Model): STATUS_CHOICE = ( diff --git a/manage.py b/manage.py index acc8f6f..4c5a90c 100755 --- a/manage.py +++ b/manage.py @@ -6,7 +6,7 @@ def main(): """Run administrative tasks.""" - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings.dev') + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings.prod') try: from django.core.management import execute_from_command_line except ImportError as exc: diff --git a/static/css/website.css b/static/css/website.css index 55d2af6..7c505d3 100644 --- a/static/css/website.css +++ b/static/css/website.css @@ -6,7 +6,7 @@ body { padding-left: 240px; } } - + /* Sidebar */ .sidebar { position: fixed; @@ -18,7 +18,7 @@ body { width: 240px; z-index: 600; } - + @media (max-width: 991.98px) { .sidebar { width: 100%; @@ -28,7 +28,7 @@ body { border-radius: 5px; box-shadow: 0 2px 5px 0 rgb(0 0 0 / 16%), 0 2px 10px 0 rgb(0 0 0 / 12%); } - + .sidebar-sticky { position: relative; top: 0; @@ -37,12 +37,12 @@ body { overflow-x: hidden; overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ } - + .foobottom { position: fixed; bottom: 0px; text-align: left; - padding-top: 30px; + padding-top: 30px; } /* .bottom { @@ -52,7 +52,7 @@ body { height: 12.5%; bottom: 0px; text-align: center; - padding-top: 30px; + padding-top: 30px; } */ .logo{ /* float:right; */ @@ -60,6 +60,12 @@ body { height: 100px; } +.logo-stretch{ + /* float:right; */ + width: 250px; + height: 50px; +} + .table-responsive { max-height:500px; -} \ No newline at end of file +} diff --git a/static/images/logos/cni.jpg b/static/images/logos/cni.jpg index 23ce6fc..b760fcf 100644 Binary files a/static/images/logos/cni.jpg and b/static/images/logos/cni.jpg differ diff --git a/static/images/logos/dst.jpeg b/static/images/logos/dst.jpeg deleted file mode 100644 index 4e9896c..0000000 Binary files a/static/images/logos/dst.jpeg and /dev/null differ diff --git a/static/images/logos/dst.png b/static/images/logos/dst.png new file mode 100644 index 0000000..d211a39 Binary files /dev/null and b/static/images/logos/dst.png differ diff --git a/static/images/logos/iisc.jpg b/static/images/logos/iisc.jpg index 08e1c04..b56d1af 100644 Binary files a/static/images/logos/iisc.jpg and b/static/images/logos/iisc.jpg differ diff --git a/templates/interface/about.html b/templates/interface/about.html index 2dd08a4..14aa73a 100644 --- a/templates/interface/about.html +++ b/templates/interface/about.html @@ -20,23 +20,25 @@

Support and Sponsors

This project was done under the Campus Rakshak initiative supported by the Department of Science and Technology, Government of India and Centre for Networked Intelligence at the Indian Institute of Science, Bangalore - +

+
+
+
+ + + +
+
+ + + +
+
+ + DST, Gov. of India + +
- - - -
- - - -
-
- - - -
- - diff --git a/templates/interface/index.html b/templates/interface/index.html index 293463b..812364d 100644 --- a/templates/interface/index.html +++ b/templates/interface/index.html @@ -3,26 +3,33 @@ {% block content %} -

What is campussim?

+

What is Campus Rakshak Simulator?

- CampusSim is an agent-based simulator that models the disease's spread via various interaction spaces on the campus. It generates an interaction graph between agents and interaction spaces. Agents are assigned different interactions spaces such as classrooms, hostels, messes, and cafeterias. CampusSim is a parsimonious model that enables a fast and concise simulation of the epidemic spread. The simulator models intervention strategies (case isolation, hostel quarantine, etc.) and users can also define their own, custom interventions to simulate. The simulator is a derivative based out of the IISc-TIFR City-Scale simulator. + Campus Rakshak Simulator is an agent-based simulator that models the disease's spread via various interaction spaces on the campus. It generates an interaction graph between agents and interaction spaces. Agents are assigned different interactions spaces such as classrooms, hostels, messes, and cafeterias. Campus Rakshak Simulator is a parsimonious model that enables a fast and concise simulation of the epidemic spread. The simulator models intervention strategies (case isolation, hostel quarantine, etc.) and users can also define their own, custom interventions to simulate. The simulator is a derivative based out of the IISc-TIFR City-Scale simulator.

Sign-in Sign-up for Campussim - +
+
+

This project was done under the Campus Rakshak initiative supported by the Department of Science and Technology, Government of India and Centre for Networked Intelligence at the Indian Institute of Science, Bangalore

+
+ + + +
-
+
diff --git a/templates/interface/nav.html b/templates/interface/nav.html index 65d54b3..22e1ac5 100644 --- a/templates/interface/nav.html +++ b/templates/interface/nav.html @@ -21,7 +21,7 @@ - Create Simualtion + Create Simulation @@ -45,7 +45,7 @@
- About Campussim + About the simulator About Campus Rakshak diff --git a/templates/interface/user_activity.html b/templates/interface/user_activity.html index 58adbb8..7bd3399 100644 --- a/templates/interface/user_activity.html +++ b/templates/interface/user_activity.html @@ -31,6 +31,7 @@
Your Activity Log
Name Type Date Created + Status View Action Remove @@ -38,8 +39,9 @@
Your Activity Log
{% for job in campuses %} {{job}} - Campus Data + Instantiated Campus {{job.created_on}} + {{job.status}}
Remove @@ -50,6 +52,7 @@
Your Activity Log
{{job}} Simulations {{job.created_on}} + {{job.status}} View Parameters {% if job.status == 'Complete' %} @@ -60,22 +63,13 @@
Your Activity Log
Remove {% endfor %} - {% for job in instantiations %} - - {{job}} - Campus instantiation - {{job.created_on}} - - - Remove - - {% endfor %} {% for job in interventions %} {{job}} Custom Intervention {{job.created_on}} + Update Remove