Merge pull request #11 from kelvin-neves/master

added lastest modification on states machine

Author: filhocf

Dockerfile

@@ -3,7 +3,7 @@ FROM python:alpine
 ARG VERSION=master
 
 RUN \
-    apk add --no-cache unzip wget ca-certificates gcc openldap-dev binutils-libs binutils gmp isl libgomp libatomic libgcc pkgconf pkgconfig mpfr3 mpc1 libstdc++ libc-dev musl-dev mariadb-dev nginx
+    apk add --no-cache unzip wget ca-certificates gcc openldap-dev binutils-libs binutils gmp isl libgomp libatomic libgcc pkgconf pkgconfig mpfr3 mpc1 libstdc++ libc-dev musl-dev mariadb-dev postgresql-dev nginx
 
 RUN \
     cd /var/www; \

ideax/forms.py

@@ -1,32 +1,31 @@
 from django import forms
 from django.utils.translation import ugettext_lazy as _
-from .models import Idea, Criterion
+from .models import Idea, Criterion, Category
 
 class IdeaForm(forms.ModelForm):
 
     class Meta:
         model = Idea
-        fields = ('title', 'description')
+        fields = ('title', 'description', )
         labels = {'title': _('Título'), 'description': _('Descrição'), }
 
 class IdeaFormUpdate(forms.ModelForm):
 
     class Meta:
         model = Idea
-        fields = ('title', 'description', 'phase')
-        labels = {'title': _('Título'), 'description': _('Descrição'), 'phase': _('Fase'), }
-
-"""
-class PhaseForm(forms.ModelForm):
+        fields = ('title', 'description')
+        labels = {'title': _('Título'), 'description': _('Descrição'),  }
 
-    class Meta:
-        model = Phase
-        fields = ('name','description')
-        labels = {'name': _('Nome'), 'description': _('Descrição'), }
-"""
 class CriterionForm(forms.ModelForm):
 
     class Meta:
         model = Criterion
         fields = ('description','peso')
         labels = {'peso': _('Peso'), 'description': _('Descrição'), }
+
+class CategoryForm(forms.ModelForm):
+
+    class Meta:
+        model = Category
+        fields = ('description', 'key_word', )
+        labels = {'description': _('Descrição'), 'key_word':_('Palavra-chave') }

ideax/migrations/0004_auto_20180307_1451.py

@@ -0,0 +1,54 @@
+# Generated by Django 2.0.1 on 2018-03-07 17: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),
+        ('ideax', '0003_auto_20180225_1220'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Category',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('description', models.CharField(max_length=200)),
+                ('key_word', models.CharField(max_length=50)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Phase_History',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('current_phase', models.PositiveSmallIntegerField()),
+                ('previous_phase', models.PositiveSmallIntegerField()),
+                ('date_change', models.DateTimeField(verbose_name='data da mudança')),
+                ('current', models.BooleanField()),
+                ('author', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.RemoveField(
+            model_name='idea',
+            name='phase',
+        ),
+        migrations.AddField(
+            model_name='idea',
+            name='discarded',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='phase_history',
+            name='idea',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='ideax.Idea'),
+        ),
+        migrations.AddField(
+            model_name='idea',
+            name='category',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='ideax.Category'),
+        ),
+    ]

ideax/models.py

@@ -1,37 +1,46 @@
 from django.db import models
 from django.utils import timezone
+from enum import Enum
 
-"""
-class Idea(models.Model):
-    author = models.ForeignKey('auth.User',on_delete=models.CASCADE)
-    title = models.CharField(max_length=200)
-    text = models.TextField()
-    created_date = models.DateTimeField(
-            default=timezone.now)
-    published_date = models.DateTimeField(
-            blank=True, null=True)
+class Phase(Enum):
+    GROW     = (1, 'Discussão', 'discussion', 'comments')
+    RATE     = (2, 'Avaliação', 'rate','clipboard')
+    APROVED  = (3, 'Aprovação', 'aproved','star')
+    ACT      = (4, 'Desenvolvimento', 'develop','tasks')
+    DONE     = (5, 'Feita', 'done', 'check')
+    ARCHIVED = (6, 'Arquivada', 'archived', 'archive')
+    PAUSED   = (7, 'Pausada', 'paused', 'pause')
 
-    def publish(self):
-        self.published_date = timezone.now()
-        self.save()
 
-    def __str__(self):
-        return self.title
-"""
-
-class Phase():
-    GROW = 1
-    RATE = 2
-    ACT = 3
-    DONE = 4
-    PHASES = (
-        (GROW, 'Crescendo'),
-    )
-    PHASES_MANAGER = (
-        (RATE, 'Avaliando'),
-        (ACT, 'Agindo'),
-        (RATE, 'Feito'),
-    )
+    def __init__(self, id, description, css_class, icon_class):
+        self.id = id
+        self.description = description
+        self.css_class =  css_class
+        self.css_icon_class = icon_class;
+
+
+    @classmethod
+    def choices(cls):
+        return tuple((x.id, x.description) for x in cls)
+
+    @classmethod
+    def get_phase_by_id(cls, id):
+        for temp in cls:
+            if temp.id == id:
+                return temp
+        return None
+
+    @classmethod
+    def get_css_class(cls, id):
+        return cls.get_phase_by_id(id)
+
+class Phase_History(models.Model):
+    current_phase = models.PositiveSmallIntegerField()
+    previous_phase = models.PositiveSmallIntegerField()
+    date_change = models.DateTimeField('data da mudança')
+    idea = models.ForeignKey('Idea',on_delete=models.DO_NOTHING)
+    author = models.ForeignKey('auth.User',on_delete=models.DO_NOTHING)
+    current = models.BooleanField()
 
 class Criterion(models.Model):
     description = models.CharField(max_length=40)
@@ -44,22 +53,31 @@ class Evaluation_Item(models.Model):
     value = models.IntegerField(default=0)
     criterion = models.ForeignKey(Criterion,on_delete=models.PROTECT)
 
+class Category(models.Model):
+    description = models.CharField(max_length=200)
+    key_word = models.CharField(max_length=50)
+
+    def __str__(self):
+        return self.description
+
 class Idea(models.Model):
     title = models.CharField(max_length=200)
     description = models.TextField(max_length=500)
     creation_date = models.DateTimeField('data criação')
     author = models.ForeignKey('auth.User',on_delete=models.CASCADE)
-    #phase = models.ForeignKey(Phase,on_delete=models.PROTECT)
-    phase = models.PositiveSmallIntegerField(choices=Phase.PHASES)
-
+    category = models.ForeignKey('Category', models.SET_NULL,null=True)
+    discarded = models.BooleanField(default=False)
 
     def count_popular_vote(self, like_boolean):
         return self.popular_vote_set.filter(like=like_boolean).count()
     def count_dislikes(self):
         return self.count_popular_vote(False)
     def count_likes(self):
         return self.count_popular_vote(True)
-
+    def get_current_phase_history(self):
+        return self.phase_history_set.get(current=True)
+    def get_current_phase(self):
+        return Phase.get_phase_by_id(self.phase_history_set.get(current=True).current_phase)
 
 class Vote(models.Model):
     evaluation_item = models.ForeignKey(Evaluation_Item,on_delete=models.PROTECT)