Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
midterm_OhMyBash
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nheo Samson
midterm_OhMyBash
Commits
0e368614
Commit
0e368614
authored
Mar 06, 2023
by
nheoxoz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated course variable in calendar
parent
0e97873c
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
41 additions
and
8 deletions
+41
-8
db.sqlite3
widget_OhMyBash/db.sqlite3
+0
-0
models.cpython-310.pyc
...MyBash/widget_calendar/__pycache__/models.cpython-310.pyc
+0
-0
views.cpython-310.pyc
...hMyBash/widget_calendar/__pycache__/views.cpython-310.pyc
+0
-0
0005_alter_event_course_alter_location_mode.py
...migrations/0005_alter_event_course_alter_location_mode.py
+25
-0
0005_alter_event_course_alter_location_mode.cpython-310.pyc
...05_alter_event_course_alter_location_mode.cpython-310.pyc
+0
-0
models.py
widget_OhMyBash/widget_calendar/models.py
+11
-7
views.py
widget_OhMyBash/widget_calendar/views.py
+5
-1
No files found.
widget_OhMyBash/db.sqlite3
View file @
0e368614
No preview for this file type
widget_OhMyBash/widget_calendar/__pycache__/models.cpython-310.pyc
View file @
0e368614
No preview for this file type
widget_OhMyBash/widget_calendar/__pycache__/views.cpython-310.pyc
View file @
0e368614
No preview for this file type
widget_OhMyBash/widget_calendar/migrations/0005_alter_event_course_alter_location_mode.py
0 → 100644
View file @
0e368614
# Generated by Django 4.1.7 on 2023-03-06 01:57
from
django.db
import
migrations
,
models
import
django.db.models.deletion
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'assignments'
,
'0001_initial'
),
(
'widget_calendar'
,
'0004_alter_event_location'
),
]
operations
=
[
migrations
.
AlterField
(
model_name
=
'event'
,
name
=
'course'
,
field
=
models
.
ForeignKey
(
on_delete
=
django
.
db
.
models
.
deletion
.
CASCADE
,
related_name
=
'event_course'
,
to
=
'assignments.course'
),
),
migrations
.
AlterField
(
model_name
=
'location'
,
name
=
'mode'
,
field
=
models
.
CharField
(
choices
=
[(
'onsite'
,
'onsite'
),
(
'online'
,
'online'
),
(
'hybrid'
,
'hybrid'
)],
default
=
'onsite'
,
max_length
=
6
),
),
]
widget_OhMyBash/widget_calendar/migrations/__pycache__/0005_alter_event_course_alter_location_mode.cpython-310.pyc
0 → 100644
View file @
0e368614
File added
widget_OhMyBash/widget_calendar/models.py
View file @
0e368614
...
@@ -2,13 +2,13 @@ from django.db import models
...
@@ -2,13 +2,13 @@ from django.db import models
class
Location
(
models
.
Model
):
class
Location
(
models
.
Model
):
onsite
=
'
O
nsite'
onsite
=
'
o
nsite'
online
=
'
O
nline'
online
=
'
o
nline'
hybrid
=
'
H
ybrid'
hybrid
=
'
h
ybrid'
mode_choices
=
[
mode_choices
=
[
(
onsite
,
'
O
nsite'
),
(
onsite
,
'
o
nsite'
),
(
online
,
'
O
nline'
),
(
online
,
'
o
nline'
),
(
hybrid
,
'
H
ybrid'
),
(
hybrid
,
'
h
ybrid'
),
]
]
mode
=
models
.
CharField
(
mode
=
models
.
CharField
(
max_length
=
6
,
choices
=
mode_choices
,
default
=
onsite
,
max_length
=
6
,
choices
=
mode_choices
,
default
=
onsite
,
...
@@ -24,7 +24,11 @@ class Event(models.Model):
...
@@ -24,7 +24,11 @@ class Event(models.Model):
activity
=
models
.
CharField
(
max_length
=
255
)
activity
=
models
.
CharField
(
max_length
=
255
)
estimated_hours
=
models
.
FloatField
()
estimated_hours
=
models
.
FloatField
()
location
=
models
.
ForeignKey
(
Location
,
on_delete
=
models
.
CASCADE
)
location
=
models
.
ForeignKey
(
Location
,
on_delete
=
models
.
CASCADE
)
course
=
models
.
CharField
(
max_length
=
100
)
course
=
models
.
ForeignKey
(
'assignments.Course'
,
on_delete
=
models
.
CASCADE
,
related_name
=
"event_course"
)
def
__str__
(
self
):
def
__str__
(
self
):
return
'{}, {}'
.
format
(
self
.
activity
,
self
.
target_datetime
)
return
'{}, {}'
.
format
(
self
.
activity
,
self
.
target_datetime
)
widget_OhMyBash/widget_calendar/views.py
View file @
0e368614
...
@@ -13,7 +13,11 @@ def index(request):
...
@@ -13,7 +13,11 @@ def index(request):
)
)
return_string
+=
'Activity: {}<br>'
.
format
(
events
.
activity
)
return_string
+=
'Activity: {}<br>'
.
format
(
events
.
activity
)
return_string
+=
'Estimated Hours: {}<br>'
.
format
(
round_hours
)
return_string
+=
'Estimated Hours: {}<br>'
.
format
(
round_hours
)
return_string
+=
'Course/Section: {}<br>'
.
format
(
events
.
course
)
return_string
+=
'Course/Section: {} {}-{}<br>'
.
format
(
events
.
course
.
code
,
events
.
course
.
title
,
events
.
course
.
section
,
)
return_string
+=
'Mode: {}<br>'
.
format
(
events
.
location
.
mode
)
return_string
+=
'Mode: {}<br>'
.
format
(
events
.
location
.
mode
)
return_string
+=
'Venue: {}<br>'
.
format
(
events
.
location
.
venue
)
return_string
+=
'Venue: {}<br>'
.
format
(
events
.
location
.
venue
)
return_string
+=
'<br>'
return_string
+=
'<br>'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment