Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e6dd2fe
#P04 Started Hackathon app
Ri-Dearg Oct 14, 2020
ce1d431
Merge branch 'master' into p04
Ri-Dearg Oct 15, 2020
cb69915
Added URLs and Installed App.
Ri-Dearg Oct 15, 2020
4f55cc6
Created "Hackathon" Model
Ri-Dearg Oct 15, 2020
2949910
Created Hack Award Category Model
Ri-Dearg Oct 15, 2020
ce56f46
HackTeam model created
Ri-Dearg Oct 15, 2020
5c004f0
Created HackProject model
Ri-Dearg Oct 15, 2020
277d7c9
Created HackProjectScoreModel
Ri-Dearg Oct 15, 2020
6ed572d
Created HackProjectScoreCategory Model
Ri-Dearg Oct 15, 2020
a2f75c1
Added Foreign Key Fields
Ri-Dearg Oct 15, 2020
2015a80
Merge branch 'master' into m05
Ri-Dearg Oct 15, 2020
2b741b2
Commented on ForeignKey fields
Ri-Dearg Oct 16, 2020
b7376ee
Added URLFields
Ri-Dearg Oct 16, 2020
45a288b
Added URLFields
Ri-Dearg Oct 16, 2020
46064fd
Merge branch 'm05' of https://github.com/Ri-Dearg/ci-hackathon-app in…
Ri-Dearg Oct 16, 2020
591169f
Delete settings.json
Ri-Dearg Oct 16, 2020
07afd39
Pull Request review changes made.
Ri-Dearg Oct 16, 2020
f210249
Merge branch 'm05' of https://github.com/Ri-Dearg/ci-hackathon-app in…
Ri-Dearg Oct 16, 2020
c85533b
Updated gitignore to ignore settings.json
Ri-Dearg Oct 16, 2020
88c7540
Added last extra line on file
Ri-Dearg Oct 16, 2020
8131a73
Removed unecessary import and quotes.
Ri-Dearg Oct 16, 2020
352c80e
Corrected Typo and added migrations.
Ri-Dearg Oct 16, 2020
1195184
Updated str method on HackProjectScoreCategory to remove "score"
Ri-Dearg Oct 16, 2020
bdefd17
Updated str method on HackProjectScoreCategory to remove "score"
Ri-Dearg Oct 16, 2020
69603b2
Merge branch 'm05' of https://github.com/Ri-Dearg/ci-hackathon-app in…
Ri-Dearg Oct 16, 2020
875cc06
Test setUp method added and functional
Ri-Dearg Oct 16, 2020
9cdbfcf
Tests written for str method on models.
Ri-Dearg Oct 16, 2020
f09fae8
Updated Related names in models
Ri-Dearg Oct 17, 2020
b1f3100
Updated .gitignore.
Ri-Dearg Oct 17, 2020
3899109
Merge branch 'master' into m05
Ri-Dearg Oct 17, 2020
f3ce532
Added migration file.
Ri-Dearg Oct 17, 2020
26fa31b
Merge branch 'm05' of https://github.com/Ri-Dearg/ci-hackathon-app in…
Ri-Dearg Oct 17, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
.env
env.py
.vscode
*.py[cod]
__pycache__/
*.sqlite3
# static/
# media/
.venv/
.env
env.py
.vscode
*.py[cod]
__pycache__/
*.sqlite3
# static/
# media/
settings.json
.gitpod.yml
.venv/
Empty file added hackathon/__init__.py
Empty file.
16 changes: 16 additions & 0 deletions hackathon/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
from django.contrib import admin
from .models import (Hackathon,
HackAwardCategory,
HackTeam,
HackProject,
HackProjectScore,
HackProjectScoreCategory)


# Register your models here.
admin.site.register(Hackathon)
admin.site.register(HackAwardCategory)
admin.site.register(HackTeam)
admin.site.register(HackProject)
admin.site.register(HackProjectScore)
admin.site.register(HackProjectScoreCategory)
5 changes: 5 additions & 0 deletions hackathon/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from django.apps import AppConfig


class HackathonConfig(AppConfig):
name = 'hackathon'
33 changes: 33 additions & 0 deletions hackathon/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Generated by Django 3.1.1 on 2020-10-15 19:02

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone


class Migration(migrations.Migration):

initial = True

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

operations = [
migrations.CreateModel(
name='Hackathon',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created', models.DateTimeField(default=django.utils.timezone.now)),
('updated', models.DateTimeField(auto_now=True)),
('display_name', models.CharField(default='', max_length=254)),
('description', models.TextField()),
('start_date', models.DateTimeField()),
('end_date', models.DateTimeField()),
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='hackathon_created', to=settings.AUTH_USER_MODEL)),
('judges', models.ManyToManyField(blank=True, related_name='hackathon_judges', to=settings.AUTH_USER_MODEL)),
('organiser', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='hackathon_organiser', to=settings.AUTH_USER_MODEL)),
],
),
]
33 changes: 33 additions & 0 deletions hackathon/migrations/0002_auto_20201015_1936.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Generated by Django 3.1.1 on 2020-10-15 19:36

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('hackathon', '0001_initial'),
]

operations = [
migrations.AlterField(
model_name='hackathon',
name='created_by',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='hackathon_created_by', to=settings.AUTH_USER_MODEL),
),
migrations.CreateModel(
name='HackAwardCategory',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created', models.DateTimeField(default=django.utils.timezone.now)),
('updated', models.DateTimeField(auto_now=True)),
('display_name', models.CharField(default='', max_length=254)),
('description', models.TextField()),
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='hackawardcategory_created_by', to=settings.AUTH_USER_MODEL)),
],
),
]
47 changes: 47 additions & 0 deletions hackathon/migrations/0003_auto_20201015_2020.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Generated by Django 3.1.1 on 2020-10-15 20:20

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('hackathon', '0002_auto_20201015_1936'),
]

operations = [
migrations.AlterModelOptions(
name='hackawardcategory',
options={'verbose_name_plural': 'Hack award categories'},
),
migrations.CreateModel(
name='HackTeam',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created', models.DateTimeField(default=django.utils.timezone.now)),
('updated', models.DateTimeField(auto_now=True)),
('display_name', models.CharField(default='', max_length=254)),
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='hackteam_created_by', to=settings.AUTH_USER_MODEL)),
('participants', models.ManyToManyField(related_name='hackteam', to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
name='HackProject',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created', models.DateTimeField(default=django.utils.timezone.now)),
('updated', models.DateTimeField(auto_now=True)),
('display_name', models.CharField(default='', max_length=255)),
('description', models.TextField()),
('github_link', models.CharField(default='', max_length=255)),
('collab_link', models.CharField(default='', max_length=255)),
('submission_time', models.DateTimeField(auto_now_add=True)),
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='hackproject_created_by', to=settings.AUTH_USER_MODEL)),
('mentor', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='hackproject_mentor', to=settings.AUTH_USER_MODEL)),
],
),
]
65 changes: 65 additions & 0 deletions hackathon/migrations/0004_auto_20201015_2224.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# Generated by Django 3.1.1 on 2020-10-15 22:24

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('hackathon', '0003_auto_20201015_2020'),
]

operations = [
migrations.AddField(
model_name='hackawardcategory',
name='hackathon',
field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='awards', to='hackathon.hackathon'),
preserve_default=False,
),
migrations.AddField(
model_name='hackawardcategory',
name='winning_project',
field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='hackathon.hackproject'),
),
migrations.AddField(
model_name='hackteam',
name='hackathon',
field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='teams', to='hackathon.hackathon'),
preserve_default=False,
),
migrations.AddField(
model_name='hackteam',
name='project',
field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='hackathon.hackproject'),
),
migrations.CreateModel(
name='HackProjectScoreCategory',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created', models.DateTimeField(default=django.utils.timezone.now)),
('updated', models.DateTimeField(auto_now=True)),
('category', models.CharField(default='', max_length=255)),
('score', models.IntegerField(default=0)),
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='hackprojectscorecategory_created_by', to=settings.AUTH_USER_MODEL)),
],
options={
'verbose_name_plural': 'Hack project score categories',
},
),
migrations.CreateModel(
name='HackProjectScore',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created', models.DateTimeField(default=django.utils.timezone.now)),
('updated', models.DateTimeField(auto_now=True)),
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='hackprojectscore_created_by', to=settings.AUTH_USER_MODEL)),
('judge', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='scores', to='hackathon.hackproject')),
('score', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hackathon.hackprojectscorecategory')),
],
),
]
76 changes: 76 additions & 0 deletions hackathon/migrations/0005_auto_20201016_1951.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Generated by Django 3.1.1 on 2020-10-16 19:51

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('hackathon', '0004_auto_20201015_2224'),
]

operations = [
migrations.RemoveField(
model_name='hackprojectscorecategory',
name='score',
),
migrations.AddField(
model_name='hackprojectscore',
name='hackprojectscorecategory',
field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='hackathon.hackprojectscorecategory'),
preserve_default=False,
),
migrations.AlterField(
model_name='hackathon',
name='created',
field=models.DateTimeField(auto_now_add=True),
),
migrations.AlterField(
model_name='hackawardcategory',
name='created',
field=models.DateTimeField(auto_now_add=True),
),
migrations.AlterField(
model_name='hackawardcategory',
name='created_by',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='hackawardcategories', to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='hackproject',
name='collab_link',
field=models.URLField(default='', max_length=255),
),
migrations.AlterField(
model_name='hackproject',
name='created',
field=models.DateTimeField(auto_now_add=True),
),
migrations.AlterField(
model_name='hackproject',
name='github_link',
field=models.URLField(default='', max_length=255),
),
migrations.AlterField(
model_name='hackprojectscore',
name='created',
field=models.DateTimeField(auto_now_add=True),
),
migrations.AlterField(
model_name='hackprojectscore',
name='score',
field=models.IntegerField(default=0),
),
migrations.AlterField(
model_name='hackprojectscorecategory',
name='created',
field=models.DateTimeField(auto_now_add=True),
),
migrations.AlterField(
model_name='hackteam',
name='created',
field=models.DateTimeField(auto_now_add=True),
),
]
18 changes: 18 additions & 0 deletions hackathon/migrations/0006_auto_20201016_2050.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.1.1 on 2020-10-16 20:50

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('hackathon', '0005_auto_20201016_1951'),
]

operations = [
migrations.RenameField(
model_name='hackprojectscore',
old_name='hackprojectscorecategory',
new_name='hack_project_score_category',
),
]
41 changes: 41 additions & 0 deletions hackathon/migrations/0007_auto_20201017_1148.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Generated by Django 3.1.1 on 2020-10-17 11:48

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('hackathon', '0006_auto_20201016_2050'),
]

operations = [
migrations.AlterField(
model_name='hackathon',
name='created_by',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='hackathons', to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='hackproject',
name='created_by',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='hackprojects', to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='hackprojectscore',
name='created_by',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='hackprojectscores', to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='hackprojectscorecategory',
name='created_by',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='hackprojectscorecategories', to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='hackteam',
name='created_by',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='hackteams', to=settings.AUTH_USER_MODEL),
),
]
Empty file.
Loading