-
Notifications
You must be signed in to change notification settings - Fork 39
#M05 Creating Hackathon Database Models #72
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
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 ce1d431
Merge branch 'master' into p04
Ri-Dearg cb69915
Added URLs and Installed App.
Ri-Dearg 4f55cc6
Created "Hackathon" Model
Ri-Dearg 2949910
Created Hack Award Category Model
Ri-Dearg ce56f46
HackTeam model created
Ri-Dearg 5c004f0
Created HackProject model
Ri-Dearg 277d7c9
Created HackProjectScoreModel
Ri-Dearg 6ed572d
Created HackProjectScoreCategory Model
Ri-Dearg a2f75c1
Added Foreign Key Fields
Ri-Dearg 2015a80
Merge branch 'master' into m05
Ri-Dearg 2b741b2
Commented on ForeignKey fields
Ri-Dearg b7376ee
Added URLFields
Ri-Dearg 45a288b
Added URLFields
Ri-Dearg 46064fd
Merge branch 'm05' of https://github.com/Ri-Dearg/ci-hackathon-app in…
Ri-Dearg 591169f
Delete settings.json
Ri-Dearg 07afd39
Pull Request review changes made.
Ri-Dearg f210249
Merge branch 'm05' of https://github.com/Ri-Dearg/ci-hackathon-app in…
Ri-Dearg c85533b
Updated gitignore to ignore settings.json
Ri-Dearg 88c7540
Added last extra line on file
Ri-Dearg 8131a73
Removed unecessary import and quotes.
Ri-Dearg 352c80e
Corrected Typo and added migrations.
Ri-Dearg 1195184
Updated str method on HackProjectScoreCategory to remove "score"
Ri-Dearg bdefd17
Updated str method on HackProjectScoreCategory to remove "score"
Ri-Dearg 69603b2
Merge branch 'm05' of https://github.com/Ri-Dearg/ci-hackathon-app in…
Ri-Dearg 875cc06
Test setUp method added and functional
Ri-Dearg 9cdbfcf
Tests written for str method on models.
Ri-Dearg f09fae8
Updated Related names in models
Ri-Dearg b1f3100
Updated .gitignore.
Ri-Dearg 3899109
Merge branch 'master' into m05
Ri-Dearg f3ce532
Added migration file.
Ri-Dearg 26fa31b
Merge branch 'm05' of https://github.com/Ri-Dearg/ci-hackathon-app in…
Ri-Dearg File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| from django.apps import AppConfig | ||
|
|
||
|
|
||
| class HackathonConfig(AppConfig): | ||
| name = 'hackathon' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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)), | ||
| ], | ||
| ), | ||
| ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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)), | ||
| ], | ||
| ), | ||
| ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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)), | ||
| ], | ||
| ), | ||
| ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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')), | ||
| ], | ||
| ), | ||
| ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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), | ||
| ), | ||
| ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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', | ||
| ), | ||
| ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.