Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added pollsapp/Poll.sqlite3
Binary file not shown.
3 changes: 2 additions & 1 deletion pollsapp/polls/admin.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from django.contrib import admin

from .models import Question, Choice
from .models import Question, Choice, Track

# Register your models here.
admin.site.register(Question)
admin.site.register(Choice)
admin.site.register(Track)
1 change: 1 addition & 0 deletions pollsapp/polls/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class QuesSerializer(serializers.ModelSerializer):
class Meta:
model = Question
fields = ('id', 'question_text')
#fields = '__all__'

class ChoiceSerializer(serializers.ModelSerializer):
class Meta:
Expand Down
17 changes: 17 additions & 0 deletions pollsapp/polls/forms.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
from django import forms
from polls.models import Question, Choice, Track
class QuestionForm(forms.ModelForm):
class Meta:
model = Question
#fields = ( 'question_text',)
fields= "__all__"
class ChoiceForm(forms.ModelForm):
class Meta:
model = Choice
#fields = ( 'choice_text',)
fields= "__all__"

class TrackForm(forms.ModelForm):
class Meta:
model = Track
fields = ( 'name',)
26 changes: 26 additions & 0 deletions pollsapp/polls/migrations/0002_auto_20190324_1308.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Generated by Django 2.1.4 on 2019-03-24 07:38

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


class Migration(migrations.Migration):

dependencies = [
('polls', '0001_initial'),
]

operations = [
migrations.CreateModel(
name='Track',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=10)),
],
),
migrations.AddField(
model_name='question',
name='track',
field=models.ForeignKey(default='', editable=False, on_delete=django.db.models.deletion.CASCADE, to='polls.Track'),
),
]
39 changes: 39 additions & 0 deletions pollsapp/polls/migrations/0003_auto_20190324_1344.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Generated by Django 2.1.4 on 2019-03-24 08:14

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


class Migration(migrations.Migration):

dependencies = [
('polls', '0002_auto_20190324_1308'),
]

operations = [
migrations.AlterField(
model_name='choice',
name='choice_text',
field=models.CharField(default='', max_length=200),
),
migrations.AlterField(
model_name='choice',
name='question',
field=models.ForeignKey(default='', on_delete=django.db.models.deletion.CASCADE, to='polls.Question'),
),
migrations.AlterField(
model_name='question',
name='pub_date',
field=models.DateTimeField(blank=True, default='', null=True),
),
migrations.AlterField(
model_name='question',
name='question_text',
field=models.CharField(default='', max_length=200),
),
migrations.AlterField(
model_name='track',
name='name',
field=models.CharField(default='', max_length=10),
),
]
50 changes: 50 additions & 0 deletions pollsapp/polls/migrations/0004_auto_20190324_1346.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Generated by Django 2.1.4 on 2019-03-24 08:16

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


class Migration(migrations.Migration):

dependencies = [
('polls', '0003_auto_20190324_1344'),
]

operations = [
migrations.AlterField(
model_name='choice',
name='choice_text',
field=models.CharField(default='', max_length=200, null=True),
),
migrations.AlterField(
model_name='choice',
name='question',
field=models.ForeignKey(default='', null=True, on_delete=django.db.models.deletion.CASCADE, to='polls.Question'),
),
migrations.AlterField(
model_name='choice',
name='votes',
field=models.IntegerField(default=0, null=True),
),
migrations.AlterField(
model_name='question',
name='created_date',
field=models.DateTimeField(default=django.utils.timezone.now, null=True),
),
migrations.AlterField(
model_name='question',
name='question_text',
field=models.CharField(default='', max_length=200, null=True),
),
migrations.AlterField(
model_name='question',
name='track',
field=models.ForeignKey(default='', editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, to='polls.Track'),
),
migrations.AlterField(
model_name='track',
name='name',
field=models.CharField(default='', max_length=10, null=True),
),
]
29 changes: 29 additions & 0 deletions pollsapp/polls/migrations/0005_auto_20190324_1629.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Generated by Django 2.1.4 on 2019-03-24 10:59

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


class Migration(migrations.Migration):

dependencies = [
('polls', '0004_auto_20190324_1346'),
]

operations = [
migrations.AlterField(
model_name='question',
name='created_date',
field=models.DateTimeField(default='', null=True),
),
migrations.AlterField(
model_name='question',
name='question_text',
field=models.CharField(default='Enter', max_length=200, null=True),
),
migrations.AlterField(
model_name='question',
name='track',
field=models.ForeignKey(default='', null=True, on_delete=django.db.models.deletion.CASCADE, to='polls.Track'),
),
]
21 changes: 21 additions & 0 deletions pollsapp/polls/migrations/0006_auto_20190324_1630.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Generated by Django 2.1.4 on 2019-03-24 11:00

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('polls', '0005_auto_20190324_1629'),
]

operations = [
migrations.RemoveField(
model_name='question',
name='created_date',
),
migrations.RemoveField(
model_name='question',
name='pub_date',
),
]
21 changes: 12 additions & 9 deletions pollsapp/polls/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,23 @@
from django.utils import timezone
import datetime

# Create your models here.
class Question(models.Model):
question_text = models.CharField(max_length=200)
pub_date = models.DateTimeField(blank=True,null=True)
created_date = models.DateTimeField(default=timezone.now)

class Track(models.Model):
name = models.CharField(max_length=10, default="",null=True)
def __str__(self):
return self.name
class Question(models.Model):
track = models.ForeignKey(Track,on_delete=models.CASCADE, default="",null=True)
question_text = models.CharField(max_length=200, default="Enter",null=True)
#pub_date = models.DateTimeField(blank=True,null=True, default="")
#created_date = models.DateTimeField(default="",null=True)
def __str__(self):
return self.question_text

class Choice(models.Model):
question = models.ForeignKey(Question, on_delete=models.CASCADE)
choice_text = models.CharField(max_length=200)
votes = models.IntegerField(default=0)
question = models.ForeignKey(Question, on_delete=models.CASCADE, default="",null=True)
choice_text = models.CharField(max_length=200, default="",null=True)
votes = models.IntegerField(default=0,null=True)

def __str__(self):
return self.choice_text

79 changes: 79 additions & 0 deletions pollsapp/polls/templates/editch.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<!DOCTYPE html>

<html lang="en">
<head>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
</head>
<body>
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">

<a class="navbar-brand" href="/polls/viewqnch"> <img src="https://www.episerver.com/4a7a59/globalassets/assets-website-structure/partners/logotypes/valuelabs.png" alt="Value Labs" WIDTH=60 HEIGHT=40> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNavDropdown">
<ul class="navbar-nav">
<li class="nav-item active">
<a class="nav-link" href="/polls/viewtr">Track <span class="sr-only">(current)</span></a>
</li>

<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="http://example.com" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Forms
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">

<a class="dropdown-item" href="/polls/viewqn">Question</a>
<a class="dropdown-item" href="/polls/viewch">Choice</a>
</div>
</li>
</ul>
</div>
</nav>
<form method="POST" class="post-form" action="/polls/updatech/{{form.id}}">
{% csrf_token %}
<div class="container">
<br>
<div class="form-group row">
<label class="col-sm-1 col-form-label"></label>
<div class="col-sm-4">
<h3>Update Details</h3>
</div>
</div>

<div class="form-group row">
<label class="col-sm-2 col-form-label"><h5>Choice Text --> </h5></label>
<div class="col-sm-4">
<input type="text" name="choice_text" id="id_choice_text" required maxlength="100" value="{{ form.choice_text }}" />

</div>
</div>

<div class="form-group row">
<label class="col-sm-2 col-form-label"><h5>Votes --> </h5></label>
<div class="col-sm-4">
<input type="text" value="{{ form.votes }}" />

</div>
</div>

<div class="form-group row">
<label class="col-sm-1 col-form-label"></label>
<div class="col-sm-4">
<button type="submit" class="btn btn-success">Update</button>
</div>
</div>
</div>
</form>
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
</body>
</html>
71 changes: 71 additions & 0 deletions pollsapp/polls/templates/editqn.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<!DOCTYPE html>

<html lang="en">
<head>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
</head>
<body>
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">

<a class="navbar-brand" href="/polls/viewqnch"> <img src="https://www.episerver.com/4a7a59/globalassets/assets-website-structure/partners/logotypes/valuelabs.png" alt="Value Labs" WIDTH=60 HEIGHT=40> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNavDropdown">
<ul class="navbar-nav">
<li class="nav-item active">
<a class="nav-link" href="/polls/viewtr">Track <span class="sr-only">(current)</span></a>
</li>

<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="http://example.com" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Forms
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">

<a class="dropdown-item" href="/polls/viewqn">Question</a>
<a class="dropdown-item" href="/polls/viewch">Choice</a>
</div>
</li>
</ul>
</div>
</nav>
<form method="POST" class="post-form" action="/polls/updateqn/{{form.id}}">
{% csrf_token %}
<div class="container">
<br>
<div class="form-group row">
<label class="col-sm-1 col-form-label"></label>
<div class="col-sm-4">
<h3>Update Details</h3>
</div>
</div>

<div class="form-group row">
<label class="col-sm-2 col-form-label"><h5>Question --> </h5></label>
<div class="col-sm-4">

<input type="text" name="question_text" id="id_question_text" required maxlength="100" value="{{ form.question_text }}" />
</div>
</div>

<div class="form-group row">
<label class="col-sm-1 col-form-label"></label>
<div class="col-sm-4">
<button type="submit" class="btn btn-success">Update</button>
</div>
</div>
</div>
</form>
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
</body>
</html>
Loading