From 582763536be1f70dae3b284a8faf82d1dddd3002 Mon Sep 17 00:00:00 2001 From: ifac0 Date: Thu, 6 Oct 2016 12:32:36 -0300 Subject: [PATCH] criando app exam --- amadeus/settings.py | 1 - avaliacao/__init__.py | 0 avaliacao/admin.py | 3 --- avaliacao/apps.py | 5 ----- avaliacao/migrations/__init__.py | 0 avaliacao/models.py | 20 -------------------- avaliacao/tests.py | 3 --- avaliacao/urls.py | 7 ------- avaliacao/views.py | 3 --- courses/urls.py | 1 - exam/__init__.py | 0 exam/admin.py | 3 +++ exam/apps.py | 5 +++++ exam/migrations/__init__.py | 0 exam/models.py | 3 +++ exam/tests.py | 3 +++ exam/views.py | 3 +++ links/models.py | 30 +++++++++++++++--------------- links/views.py | 64 ++++++++++++++++++++++++++++++++-------------------------------- 19 files changed, 64 insertions(+), 90 deletions(-) delete mode 100644 avaliacao/__init__.py delete mode 100644 avaliacao/admin.py delete mode 100644 avaliacao/apps.py delete mode 100644 avaliacao/migrations/__init__.py delete mode 100644 avaliacao/models.py delete mode 100644 avaliacao/tests.py delete mode 100644 avaliacao/urls.py delete mode 100644 avaliacao/views.py create mode 100644 exam/__init__.py create mode 100644 exam/admin.py create mode 100644 exam/apps.py create mode 100644 exam/migrations/__init__.py create mode 100644 exam/models.py create mode 100644 exam/tests.py create mode 100644 exam/views.py diff --git a/amadeus/settings.py b/amadeus/settings.py index 956b444..481955f 100644 --- a/amadeus/settings.py +++ b/amadeus/settings.py @@ -55,7 +55,6 @@ INSTALLED_APPS = [ 'courses', 'forum', 'poll', - 'avaliacao', 'links', ] diff --git a/avaliacao/__init__.py b/avaliacao/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/avaliacao/__init__.py +++ /dev/null diff --git a/avaliacao/admin.py b/avaliacao/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/avaliacao/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/avaliacao/apps.py b/avaliacao/apps.py deleted file mode 100644 index bd8d7f1..0000000 --- a/avaliacao/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class AvaliacaoConfig(AppConfig): - name = 'avaliacao' diff --git a/avaliacao/migrations/__init__.py b/avaliacao/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/avaliacao/migrations/__init__.py +++ /dev/null diff --git a/avaliacao/models.py b/avaliacao/models.py deleted file mode 100644 index 8a0cc42..0000000 --- a/avaliacao/models.py +++ /dev/null @@ -1,20 +0,0 @@ -from django.utils.translation import ugettext_lazy as _ -from django.db import models -from autoslug.fields import AutoSlugField -from users.models import User -from core.models import Resource -from courses.models import Activity - -class Avaliacao(Activity): - - name_avalicao = models.CharField(_('Name'), max_length = 100) - init_date = models.DateField(_('Begin of Avaliacao Date')) - end_date = models.DateField(_('End of Avaliacao Date')) - - class Meta: - #ordering = ('create_date','name') - verbose_name = _('Avaliacao') - verbose_name_plural = _('Avaliacoes') - -def __str__(self): - return str(self.name) + str("/") + str(self.topic) diff --git a/avaliacao/tests.py b/avaliacao/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/avaliacao/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/avaliacao/urls.py b/avaliacao/urls.py deleted file mode 100644 index 4ac923c..0000000 --- a/avaliacao/urls.py +++ /dev/null @@ -1,7 +0,0 @@ -from django.conf.urls import url - -from . import views - -urlpatterns =[ - -] diff --git a/avaliacao/views.py b/avaliacao/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/avaliacao/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/courses/urls.py b/courses/urls.py index 57c6679..140fc74 100644 --- a/courses/urls.py +++ b/courses/urls.py @@ -26,5 +26,4 @@ urlpatterns = [ url(r'^forum/', include('forum.urls', namespace = 'forum')), url(r'^poll/', include('poll.urls', namespace = 'poll')), - url(r'^avaliacao/', include('avaliacao.urls', namespace = 'avaliacao')) ] diff --git a/exam/__init__.py b/exam/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/exam/__init__.py diff --git a/exam/admin.py b/exam/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/exam/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/exam/apps.py b/exam/apps.py new file mode 100644 index 0000000..9649087 --- /dev/null +++ b/exam/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class ExamConfig(AppConfig): + name = 'exam' diff --git a/exam/migrations/__init__.py b/exam/migrations/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/exam/migrations/__init__.py diff --git a/exam/models.py b/exam/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/exam/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/exam/tests.py b/exam/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/exam/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/exam/views.py b/exam/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/exam/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/links/models.py b/links/models.py index 8fe9328..064fa13 100644 --- a/links/models.py +++ b/links/models.py @@ -1,15 +1,15 @@ -from django.db import models -from courses.models import Material -# Create your models here. -class Link(Material,models.Model): - name = models.CharField(max_lenght = 100) - link = models.UrlField() - description = models.CharField(max_lenght = 200) - class Meta: - verbose_name = 'Link' - verbose_name_plural = "Links" - def __str__(self): - return str(self.name) - - - +# from django.db import models +# from courses.models import Material +# # Create your models here. +# class Link(Material,models.Model): +# name = models.CharField(max_lenght = 100) +# link = models.UrlField() +# description = models.CharField(max_lenght = 200) +# class Meta: +# verbose_name = 'Link' +# verbose_name_plural = "Links" +# def __str__(self): +# return str(self.name) +# +# +# diff --git a/links/views.py b/links/views.py index acbf2ab..8f034ff 100644 --- a/links/views.py +++ b/links/views.py @@ -1,32 +1,32 @@ -from django.shortcuts import render -from django.views import generic -from django.core.urlresolvers import reverse_lazy -from django.contrib import messages -from django.utils.translation import ugettext_lazy as _ - - -from .models import Link -from .forms import * - -# Create your views here. -class CreateLink(generic.CreateView): - template_name = 'links/' - form_class = CreateLinkForm - success_url = reverse_lazy() - def form_valid(self, form): - form.save() - messages.success(self.request, _('Link created successfully!')) - return super(CreateLink, self).form_valid(form) - - -class DeleteLink(generic.DeleteView): - -class UpdateLink(generic.UpdateView): - template_name = 'links/' - form_class = UpdateLinkForm - success_url = reverse_lazy() - def form_valid(self, form): - form.save() - messages.success(self.request, _('Link updated successfully!')) - - return super(UpdateLink, self).form_valid(form) +# from django.shortcuts import render +# from django.views import generic +# from django.core.urlresolvers import reverse_lazy +# from django.contrib import messages +# from django.utils.translation import ugettext_lazy as _ +# +# +# from .models import Link +# from .forms import * +# +# # Create your views here. +# class CreateLink(generic.CreateView): +# template_name = 'links/' +# form_class = CreateLinkForm +# success_url = reverse_lazy() +# def form_valid(self, form): +# form.save() +# messages.success(self.request, _('Link created successfully!')) +# return super(CreateLink, self).form_valid(form) +# +# +# class DeleteLink(generic.DeleteView): +# +# class UpdateLink(generic.UpdateView): +# template_name = 'links/' +# form_class = UpdateLinkForm +# success_url = reverse_lazy() +# def form_valid(self, form): +# form.save() +# messages.success(self.request, _('Link updated successfully!')) +# +# return super(UpdateLink, self).form_valid(form) -- libgit2 0.21.2