Develop

.github/workflows/django.yml

@@ -1,15 +1,28 @@
 name: Python application
 
-on: [push]
+on: 
+  push:
+    branches:
+      - master
+      - develop
+  workflow_call:
+    secrets:
+      CODACY_PROJECT_TOKEN:
+        required: true
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        pyversion: ['3.8']
+        pgversion: ['10.8', '12']
 
     services:
       postgres:
-        image: postgres:10.8
+        image: postgres:${{matrix.pgversion}}
         env:
           POSTGRES_USER: decide
           POSTGRES_PASSWORD: decide
@@ -21,10 +34,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.8
+    - name: Set up Python ${{matrix.pyversion}}
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: ${{matrix.pyversion}}
     - name: psycopg2 prerequisites
       run: sudo apt-get install libpq-dev
     - name: Install dependencies and config
@@ -46,4 +59,4 @@ jobs:
       uses: codacy/codacy-coverage-reporter-action@v1
       with:
           project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
-          coverage-reports: decide/coverage.xml 
+          coverage-reports: decide/coverage.xml

.github/workflows/first.yml

@@ -0,0 +1,21 @@
+name: release
+
+on:
+  push: 
+    tags:
+      - '*'
+
+jobs:
+  buildTest:
+    uses: jorsilman/decide-23/.github/workflows/django.yml@master
+    secrets: 
+      CODACY_PROJECT_TOKEN: ${{secrets.CODACY_PROJECT_TOKEN}}
+
+  release:
+    needs: buildTest
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Release
+        uses: softprops/action-gh-release@v1

README.md

@@ -1,4 +1,7 @@
-[![Build Status](https://travis-ci.com/wadobo/decide.svg?branch=master)](https://travis-ci.com/wadobo/decide) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Grade) [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Coverage)
+[![Build Status](https://travis-ci.com/wadobo/decide.svg?branch=master)](https://travis-ci.com/wadobo/decide) 
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/cba8fd0874ac4f569f4f880e473cbac9?branch=master)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Grade) 
+[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/cba8fd0874ac4f569f4f880e473cbac9?branch=master)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Coverage)
+[![Python application](https://github.com/jorsilman/decide-23/actions/workflows/django.yml/badge.svg)](https://github.com/jorsilman/decide-23/actions/workflows/django.yml)
 
 Plataforma voto electrónico educativa
 =====================================
@@ -290,3 +293,5 @@ A tener en cuenta:
   concurrentes, cuando pongamos más de 100, lo normal es que empiecen a fallar muchas peticiones.
 * Si hacemos las pruebas en local, donde tenemos activado el modo debug de Django, lo normal es que
   las peticiones tarden algo más y consigamos menos RPS (Peticiones por segundo).
+
+

decide/base/migrations/0001_initial.py

@@ -1,5 +1,6 @@
-# Generated by Django 2.0 on 2018-06-05 08:42
+# Generated by Django 2.0 on 2022-12-12 16:03
 
+import base.models
 from django.db import migrations, models
 
 
@@ -24,10 +25,10 @@ class Migration(migrations.Migration):
             name='Key',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('p', models.IntegerField()),
-                ('g', models.IntegerField()),
-                ('y', models.IntegerField()),
-                ('x', models.IntegerField(blank=True, null=True)),
+                ('p', base.models.BigBigField()),
+                ('g', base.models.BigBigField()),
+                ('y', base.models.BigBigField()),
+                ('x', base.models.BigBigField(blank=True, null=True)),
             ],
         ),
     ]

decide/booth/templates/booth/booth.html

@@ -191,7 +191,8 @@ <h2>[[ voting.question.desc ]]</h2>
                         vote: {a: v.alpha.toString(), b: v.beta.toString()},
                         voting: this.voting.id,
                         voter: this.user.id,
-                        token: this.token
+                        token: this.token,
+                        type: this.voting.type
                     }
                     this.postData("{% url "gateway" "store" "/" %}", data)
                         .then(data => {

decide/booth/urls.py

@@ -1,7 +1,14 @@
 from django.urls import path
-from .views import BoothView
+
+from .views import BoothView, ScoreBoothView, BoothBinaryView
+
 
 
 urlpatterns = [
     path('<int:voting_id>/', BoothView.as_view()),
+
+    path('scoreVoting/<int:voting_id>/', ScoreBoothView.as_view()),
+
+    path('binaryVoting/<int:voting_id>/', BoothBinaryView.as_view()),
+
 ]

decide/booth/views.py

@@ -1,31 +1,74 @@
 import json
+
+from voting.models import ScoreVoting
+
+from django.shortcuts import get_object_or_404
+
 from django.views.generic import TemplateView
 from django.conf import settings
 from django.http import Http404
 
 from base import mods
 
+from voting.models import Voting, VotingBinary
+
+
 
 # TODO: check permissions and census
 class BoothView(TemplateView):
     template_name = 'booth/booth.html'
 
-    def get_context_data(self, **kwargs):
+    def get_context_data(self,voting_id, **kwargs):
         context = super().get_context_data(**kwargs)
-        vid = kwargs.get('voting_id', 0)
+        #vid = kwargs.get('voting_id', 0)
 
         try:
-            r = mods.get('voting', params={'id': vid})
+            voting = get_object_or_404(Voting,pk=voting_id)
+
+            context['voting'] = json.dumps(voting.toJson())
+
+        except:
+            raise Http404
 
-            # Casting numbers to string to manage in javascript with BigInt
-            # and avoid problems with js and big number conversion
-            for k, v in r[0]['pub_key'].items():
-                r[0]['pub_key'][k] = str(v)
+        context['KEYBITS'] = settings.KEYBITS
 
-            context['voting'] = json.dumps(r[0])
+        return context
+
+class BoothBinaryView(TemplateView):
+    template_name = 'booth/booth.html'
+
+    def get_context_data(self,voting_id, **kwargs):
+        context = super().get_context_data(**kwargs)
+        #vid = kwargs.get('voting_id', 0)
+
+        try:
+            voting = get_object_or_404(VotingBinary,pk=voting_id)
+
+            context['voting'] = json.dumps(voting.toJson())
+
         except:
             raise Http404
 
         context['KEYBITS'] = settings.KEYBITS
 
         return context
+
+
+class ScoreBoothView(TemplateView):
+    template_name = 'booth/booth.html'
+
+    def get_context_data(self, voting_id, **kwargs):
+
+        context = super().get_context_data(**kwargs)
+
+        try:
+            voting = get_object_or_404(ScoreVoting,pk=voting_id)
+
+            context['voting'] = json.dumps(ScoreVoting.toJson(voting))
+        except:
+            raise Http404
+
+        context['KEYBITS'] = settings.KEYBITS
+
+        return context
+

decide/census/admin.py

@@ -4,8 +4,8 @@
 
 
 class CensusAdmin(admin.ModelAdmin):
-    list_display = ('voting_id', 'voter_id')
-    list_filter = ('voting_id', )
+    list_display = ('voting_id', 'voter_id','type')
+    list_filter = ('voting_id', 'type')
 
     search_fields = ('voter_id', )
 

decide/census/forms.py

@@ -0,0 +1,12 @@
+from django import forms
+
+TYPES = [('CSV','CSV'), ('JSON','JSON'), ('XML','XML')]
+class NameForm(forms.Form):
+    q = forms.CharField(required=False,label='Votante', max_length=100)
+    x = forms.CharField(required=False,label='Votación', max_length=100)
+    t = forms.ChoiceField(required=False,label=' Exportar a',choices=TYPES,widget=forms.RadioSelect)
+
+
+
+
+

decide/census/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.0 on 2018-04-08 17:16
+# Generated by Django 2.0 on 2022-12-12 16:51
 
 from django.db import migrations, models
 
@@ -17,10 +17,11 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('voting_id', models.PositiveIntegerField()),
                 ('voter_id', models.PositiveIntegerField()),
+                ('type', models.CharField(choices=[('V', 'Voting'), ('SV', 'ScoreVoting'), ('BV', 'BinaryVoting')], default='V', max_length=2)),
             ],
         ),
         migrations.AlterUniqueTogether(
             name='census',
-            unique_together={('voting_id', 'voter_id')},
+            unique_together={('voting_id', 'voter_id', 'type')},
         ),
     ]

decide/census/models.py

@@ -4,6 +4,9 @@
 class Census(models.Model):
     voting_id = models.PositiveIntegerField()
     voter_id = models.PositiveIntegerField()
+    votingTypes = (('V', 'Voting'), ('SV', 'ScoreVoting'), ('BV', 'BinaryVoting'))
+    type = models.CharField(max_length=2, choices=votingTypes, default='V')
+
 
     class Meta:
-        unique_together = (('voting_id', 'voter_id'),)
+        unique_together = (('voting_id', 'voter_id','type'),)

decide/census/static/census/censusForAll.css

@@ -0,0 +1,33 @@
+.form {
+    width: 100%;
+    max-width: 600px;
+    margin: 0 auto;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .form select {
+    width: 350px;
+    height: 60px;
+    margin: 1rem;font-size: 30px!important;
+  }
+
+  .btn{
+    width: 200px;
+    height: 60px;
+    margin: 1rem;
+    font-size: 25px!important;
+  }
+  body{
+    background-image: url('./fondoEvoting.png')!important;
+  }
+
+  #botonHome{
+    position: absolute; /* Posicionamos de forma absoluta*/
+  top: 5%; /* Calculamos la posición*/
+  right: 90%; /* Calculamos la posición*/
+  width: auto!important;
+  height: auto!important;
+  }