Skip to content

M
midterm_nicsbabes
Commit 272f59af authored by Sharmaine Chua's avatar Sharmaine Chua
Browse files
Options

fixed some merge conflicts

parents fe5a031c 1366ddba
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 40 deletions
widget_nicsbabes/announcement_board/migrations/0002_alter_announcement_pub_datetime.py 0 → 100644
View file @ 272f59af
# Generated by Django 3.2 on 2023-05-13 12:54
from django.db import migrations, models
import django.utils.timezone
class Migration(migrations.Migration):
dependencies = [
('announcement_board', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='announcement',
name='pub_datetime',
field=models.DateTimeField(default=django.utils.timezone.now),
),
]
widget_nicsbabes/dashboard/views.py
View file @ 272f59af
...@@ -25,43 +25,4 @@ class WidgetUserCreateView(CreateView): ...@@ -25,43 +25,4 @@ class WidgetUserCreateView(CreateView):
class WidgetUserUpdateView(UpdateView): class WidgetUserUpdateView(UpdateView):
model = WidgetUser model = WidgetUser
template_name = 'dashboard/widgetuser-edit.html' template_name = 'dashboard/widgetuser-edit.html'
fields = '__all__' fields = '__all__'
\ No newline at end of file
# from django.shortcuts import render
# from django.http import HttpResponse
# from .models import WidgetUser
# def index(request):
# return_string = '<body>'
# for user in WidgetUser.objects.all():
# user_string = '{}, {} {}'.format(
# user.last_name, user.first_name, user.middle_name
# )
# dept_string = '{}: {}'.format(
# user.department.dept_name, user.department.home_unit
# )
# return_string += user_string + " from the " + dept_string + "<br>"
# html_string = '<html>{}</html>'.format(return_string)
# return HttpResponse("Welcome to Widget! <br> <br>WIDGET USERS: <br>" + html_string)
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment