Merge branch 'master' into 'Announcement_Board'

# Conflicts: # widget_huli/widget_huli/urls.py

Merge branch 'master' into 'Announcement_Board'
# Conflicts: # widget_huli/widget_huli/urls.py
2a99b6a5 · Brescia Amandy · ff696d23 · 20150d91 · 2a99b6a5 · 2a99b6a5
Commit 2a99b6a5 authored Mar 06, 2023 by Brescia Amandy
12 changed files
--- a/widget_huli/dashboard/__init__.py
+++ b/widget_huli/dashboard/__init__.py
--- a/widget_huli/dashboard/admin.py
+++ b/widget_huli/dashboard/admin.py
+from django.contrib import admin
+from .models import Department, WidgetUser
+class DepartmentAdmin(admin.ModelAdmin):
+    model = Department
+    list_display = ('dept_name', 'home_unit')
+    search_fields = ('dept_name', 'home_unit')
+    list_filter = ('dept_name',)
+class WidgetUserAdmin(admin.ModelAdmin):
+    model = WidgetUser
+    list_display = ('last_name', 'first_name', 'middle_name', 'department')
+    search_fields = ('last_name', 'first_name', 'middle_name')
+    list_filter = ('last_name', 'first_name')
+admin.site.register(Department, DepartmentAdmin)
+admin.site.register(WidgetUser, WidgetUserAdmin)
--- a/widget_huli/dashboard/apps.py
+++ b/widget_huli/dashboard/apps.py
+from django.apps import AppConfig
+class DashboardConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'dashboard'
--- a/widget_huli/dashboard/migrations/0001_initial.py
+++ b/widget_huli/dashboard/migrations/0001_initial.py
+# Generated by Django 4.1.7 on 2023-03-04 06:14
+from django.db import migrations, models
+import django.db.models.deletion
+class Migration(migrations.Migration):
+    initial = True
+    dependencies = [
+    ]
+    operations = [
+        migrations.CreateModel(
+            name='Department',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('dept_name', models.CharField(max_length=60)),
+                ('home_unit', models.CharField(max_length=100)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='WidgetUser',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('first_name', models.CharField(max_length=20)),
+                ('middle_name', models.CharField(max_length=20)),
+                ('last_name', models.CharField(max_length=20)),
+                ('department', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='dashboard.department')),
+            ],
+        ),
+    ]
--- a/widget_huli/dashboard/migrations/__init__.py
+++ b/widget_huli/dashboard/migrations/__init__.py
--- a/widget_huli/dashboard/models.py
+++ b/widget_huli/dashboard/models.py
+from django.db import models
+class Department(models.Model):
+    dept_name = models.CharField(max_length=60)
+    home_unit = models.CharField(max_length=100)
+    def __str__(self):
+        return '{}, {}'.format(self.dept_name, self.home_unit)
+class WidgetUser(models.Model):
+    first_name = models.CharField(max_length=20)
+    middle_name = models.CharField(max_length=20)
+    last_name = models.CharField(max_length=20)
+    department = models.ForeignKey(Department, null=True, on_delete=models.CASCADE)
+    def __str__(self):
+        return '{}, {} {} : {}'.format(self.last_name, self.first_name, self.middle_name, self.department)
\ No newline at end of file
--- a/widget_huli/dashboard/tests.py
+++ b/widget_huli/dashboard/tests.py
+from django.test import TestCase
+# Create your tests here.
--- a/widget_huli/dashboard/urls.py
+++ b/widget_huli/dashboard/urls.py
+from django.urls import path
+from .views import index
+urlpatterns = [
+    path('',index, name = 'index'),
+]
+dashboard = "Dashboard"
\ No newline at end of file
--- a/widget_huli/dashboard/views.py
+++ b/widget_huli/dashboard/views.py
+from django.shortcuts import render
+from django.http import HttpResponse
+from .models import WidgetUser, Department
+def index(request):
+    text_in_http = "Welcome to Widget! <br> <br> WIDGET USERS: <br> <ul>"
+    for user in WidgetUser.objects.all():
+        text_in_http += "<li>{}, {} {} : {}</li>".format(user.last_name, user.first_name,
+                                                   user.middle_name, user.department
+        )
+    text_in_http += "</ul>"
+    html_string = '<html><body>{}</body></html>'.format(text_in_http)
+    return HttpResponse(html_string)
--- a/widget_huli/db.sqlite3
+++ b/widget_huli/db.sqlite3
--- a/widget_huli/widget_huli/settings.py
+++ b/widget_huli/widget_huli/settings.py
@@ -9,7 +9,10 @@ https://docs.djangoproject.com/en/4.1/topics/settings/
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/4.1/ref/settings/
 """
+import os
+from dotenv import load_dotenv
+load_dotenv()
 from pathlib import Path
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
@@ -19,9 +22,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/
-# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = os.getenv('SECRET_KEY')
-SECRET_KEY = 'django-insecure-gteg#r+a3^&nw_f+1)zcy#m72jv-i)wqfktiz$+#*6zem+6h^9'
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
@@ -31,6 +32,7 @@ ALLOWED_HOSTS = []
 # Application definition
 INSTALLED_APPS = [
+    'dashboard',
    'django.contrib.admin',
    'django.contrib.auth',
    'django.contrib.contenttypes',

--- a/widget_huli/widget_huli/urls.py
+++ b/widget_huli/widget_huli/urls.py
@@ -16,7 +16,9 @@ Including another URLconf
 from django.contrib import admin
 from django.urls import include, path
 urlpatterns = [
    path('Announcement_Board/', include('Announcement_Board.urls', namespace="Announcement_Board" )),
+    path('dashboard', include('dashboard.urls', namespace="dashboard")),
    path('admin/', admin.site.urls),
 ]