EGCETSII · lauporsol · Nov 19, 2020 · Dec 30, 2020 · Dec 30, 2020 · Dec 31, 2020
diff --git a/.travis.yml b/.travis.yml
@@ -4,18 +4,32 @@ services:
   - postgresql
 addons:
   postgresql: "9.4"
+  chrome: stable
+  firefox: latest
 before_script:
   - psql -U postgres -c "create user decide password 'decide'"
   - psql -U postgres -c "create database test_decide owner decide"
   - psql -U postgres -c "ALTER USER decide CREATEDB"
+  - psql -U postgres -c "create database decide owner decide"
 language: python
 python:
   - "3.6"
 install:
   - pip install -r requirements.txt
   - pip install codacy-coverage
+  - pip install selenium
+  - sudo apt-get install firefox
+  - wget "https://github.com/mozilla/geckodriver/releases/download/v0.27.0/geckodriver-v0.27.0-linux64.tar.gz"
+  - tar xfz geckodriver-v0.27.0-linux64.tar.gz
+  - sudo mv -f geckodriver /usr/bin
 script:
   - cd decide
-  - coverage run --branch --source=. ./manage.py test --keepdb --with-xunit
+  - coverage run --branch --source=. ./manage.py test booth/ --keepdb --with-xunit
   - coverage xml
   - python-codacy-coverage -r coverage.xml
+notifications:
+  email:
+    recipients:
+      - davcacrom@alum.us.es
+    on_succes: never
+    on_failure: always
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![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&amp;utm_medium=referral&amp;utm_content=wadobo/decide&amp;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)
 
-Plataforma voto electrónico educativa
+Plataforma voto electrónico educativa pro
 =====================================
 
 El objetivo de este proyecto es implementar una plataforma de voto

diff --git a/README2.md b/README2.md
@@ -0,0 +1,16 @@
+[![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&amp;utm_medium=referral&amp;utm_content=wadobo/decide&amp;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)
+
+Estructura de commits
+========================================
+
+El formato utilizado en los mensajes de los commits será:
+
+* **Type**: grupo de cambios al que pertenece el commit. Puede ser de varios tipos:
+    * **Fix**: correción de un error
+    * **Feature**: nueva funcionalidad en el sistema o refactorización del código
+    * **Doc**: cambios en la documentación
+    * **Test**: creación o actualización de tests
+
+ * **Subject**: asunto concreto del commit. Se debe utilizar el participio
+ * **Issue**: campo opcional. Incidencia a la que hace referencia.
+ * **Body**: descripción del contenido del commit. Formato libre. Se debe utilizar la tercera en pretérito perfecto
diff --git a/decide/base/static/css/style.css b/decide/base/static/css/style.css
@@ -0,0 +1,12 @@
+#bg {
+	background-repeat: no-repeat;
+	background-size: 1800px 900px;
+	background-position: top;
+	background-attachment: fixed;
+	-webkit-background-size: cover;
+  	-moz-background-size: cover;
+  	-o-background-size: cover;
+}
+
+
+
diff --git a/decide/base/static/img/bg.jpg b/decide/base/static/img/bg.jpg
diff --git a/decide/base/static/img/logo.png b/decide/base/static/img/logo.png
diff --git a/decide/base/templates/base.html b/decide/base/templates/base.html
@@ -1,14 +1,30 @@
+{% load static %}
 <!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8" />
-        <title>{% block title %}Decide!{% endblock %}</title>
-        {% block extrahead %}{% endblock %}
-    </head>
-    <body>
-        {% block content %}
-        {% endblock %}
+<html lang='es'>
 
-        {% block extrabody %}{% endblock %}
-    </body>
-</html>
+<head>
+	<meta charset='utf-8'>
+	<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+	<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css">
+	<link rel="stylesheet" href="{% static 'css/style.css' %}">
+	<link href="//fonts.googleapis.com/css?family=Lobster&subset=latin,latin-ext" rel="stylesheet" type="text/css">
+	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
+	<script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
+</head>
+
+<body id="bg" style="background-image: url('{%static "img/bg.jpg"%}');">
+	<header>
+
+			<div class="nav-header">
+						<a id="logo" class="navbar-brand" rel="home" href='/booth' title="Decide"><img
+						src="{%static "img/logo.png"%}" /></a>
+			</div>
+			{% block encabezado %}{% endblock %}
+	</header>
+	<section>
+		{% block contenido %}{% endblock %}
+	</section>
+	{% block pie %}{% endblock %}
+</body>
+
+</html>
diff --git a/decide/base/templates/base.html.py b/decide/base/templates/base.html.py
@@ -0,0 +1,14 @@
+XXXXXXXXX XXXXX
+XXXXXX
+    XXXXXX
+        XXXXX XXXXXXXXXXXXXXX XX
+        XXXXXXXBBBBB BBBBBXXXXXXXBBBBBBBBXXXXXXXX
+        BBBBB BBBBBBBBBBBBBBBBB
+    XXXXXXX
+    XXXXXX
+        BBBBB BBBBBBB
+        BBBBBBBB
+
+        BBBBB BBBBBBBBBBBBBBBBB
+    XXXXXXX
+XXXXXXX
diff --git a/decide/booth/admin.py b/decide/booth/admin.py
@@ -1,3 +1,4 @@
 from django.contrib import admin
 
 # Register your models here.
+
diff --git a/decide/booth/desktopClient/.idea/.gitignore b/decide/booth/desktopClient/.idea/.gitignore
diff --git a/decide/booth/desktopClient/.idea/decide.iml b/decide/booth/desktopClient/.idea/decide.iml
diff --git a/decide/booth/desktopClient/.idea/inspectionProfiles/profiles_settings.xml b/decide/booth/desktopClient/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/decide/booth/desktopClient/.idea/misc.xml b/decide/booth/desktopClient/.idea/misc.xml
diff --git a/decide/booth/desktopClient/.idea/modules.xml b/decide/booth/desktopClient/.idea/modules.xml
diff --git a/decide/booth/desktopClient/main.py b/decide/booth/desktopClient/main.py
@@ -0,0 +1,210 @@
+import gi
+import datetime
+
+gi.require_version('Gtk', '3.0')
+from gi.repository import Gtk, GdkPixbuf, Gdk
+from gi.repository.Gdk import Color
+import os, sys, psycopg2, psycopg2.extras, hashlib
+import django.contrib.auth.hashers
+
+class GUI:
+    def __init__(self):
+        django.contrib.auth.hashers.settings.configure()
+
+        self.builder = Gtk.Builder()
+        self.builder.add_from_file('main.ui')
+        self.builder.connect_signals(self)
+
+        try:
+            conn = psycopg2.connect(dbname="decidedb2", user="decide2", password="decide", host="127.0.0.1", port="5432")
+            self.cur = conn.cursor(cursor_factory=psycopg2.extras.NamedTupleCursor)
+            print("Conectado")
+        except Exception as e:
+            print(e)
+
+        window = self.builder.get_object('window')
+        window.show_all()
+        window.fullscreen()
+
+    def on_window_destroy(self, window):
+        Gtk.main_quit()
+
+    def on_login_clicked(self, button, false=None):
+        username = self.builder.get_object('username').get_text()
+        password = self.builder.get_object('password').get_text()
+        voting_id = self.builder.get_object('votingId').get_text()
+
+        COLOR_INVALID = Color(50000, 0, 0)
+        self.builder.get_object('usernameLabelError').modify_fg(Gtk.StateFlags.NORMAL, COLOR_INVALID)
+        self.builder.get_object('passwordLabelError').modify_fg(Gtk.StateFlags.NORMAL, COLOR_INVALID)
+        self.builder.get_object('votingIdLabelError').modify_fg(Gtk.StateFlags.NORMAL, COLOR_INVALID)
+
+        if not username:
+            self.builder.get_object('usernameLabelError').set_text("Empty Username")
+        else:
+            self.builder.get_object('usernameLabelError').set_text("")
+
+        if not password:
+            self.builder.get_object('passwordLabelError').set_text("Empty Password")
+        else:
+            self.builder.get_object('passwordLabelError').set_text("")
+
+        if not voting_id:
+            self.builder.get_object('votingIdLabelError').set_text("Must insert voting identifier")
+        else:
+            self.builder.get_object('votingIdLabelError').set_text("")
+
+        if password and username and voting_id and voting_id:
+            self.cur.execute("SELECT id, username, password from public.auth_user where username = %s", [username])
+            user = self.cur.fetchone()
+
+            if not user:
+                print("User not found")
+                self.builder.get_object('usernameLabelError').set_text("Invalid user or password")
+            else:
+                cryptedPassword = user[2]
+                passOk = django.contrib.auth.hashers.check_password(password, cryptedPassword)
+                check_voting_access = self.check_voting_access(user, voting_id)
+                check_already_voted = self.check_already_voted(user, voting_id)
+                if passOk and check_voting_access and check_already_voted == False:
+                    print("Correct user")
+                    user_token = user[0]
+                    print("User token " + str(user_token))
+                    self.voting(user, voting_id)
+                elif passOk:
+                    self.builder.get_object('votingIdLabelError').set_text("You don't have access to the voting")
+                else:
+                    print("Invalid password")
+                    self.builder.get_object('usernameLabelError').set_text("Invalid user or password")
+
+    def logged_user(self, user):
+        self.builder.add_from_file('list_votings.ui')
+        self.cur.execute("SELECT * from voting_voting")
+        votings = self.cur.fetchall()
+
+        self.grid = Gtk.Grid()
+        self.grid.set_column_homogeneous(True)
+        self.grid.set_row_homogeneous(True)
+        self.add(self.grid)
+
+        for voting in votings:
+            print(voting[1] + " - "+ voting[2])
+
+    def check_voting_access(self, user, voting_id):
+        start_date_ok = False
+        end_date_ok = False
+        voting_id_ok = False
+
+        self.cur.execute("SELECT NOW()")
+        current_date_str = str(self.cur.fetchone()[0])[:-6]
+        current_date = datetime.datetime.strptime(current_date_str, '%Y-%m-%d %H:%M:%S.%f')
+
+        self.cur.execute("SELECT * from voting_voting where id = %s", [voting_id])
+        voting = self.cur.fetchone()
+
+        if voting == None:
+            self.builder.get_object('votingIdLabelError').set_text("No se ha encontrado")
+        else:
+            start_date_str = str(voting[3])[:-6]
+            start_date = datetime.datetime.strptime(current_date_str, '%Y-%m-%d %H:%M:%S.%f')
+            start_date_ok = start_date <= current_date
+
+            end_date_ok = voting[4] == None
+
+            self.cur.execute("SELECT * from census_census where voting_id = %s and voter_id = %s", [voting_id, user[0]])
+            select = self.cur.fetchone()
+            voting_id_ok = select != None
+
+        return start_date_ok and end_date_ok and voting_id_ok
+
+    def check_already_voted(self, user, voting_id):
+
+        self.cur.execute("SELECT * from store_vote where voting_id = %s and voter_id = %s", [voting_id,user[0]])
+        result = self.cur.fetchone()
+
+        return result != None
+
+    def voting(self, user, voting_id):
+        # self.builder.add_from_file('voting.ui')
+        self.cur.execute("SELECT * from voting_voting where id = %s", [voting_id])
+        voting = self.cur.fetchone()
+
+        votingWin = VotingWindow(voting)
+        votingWin.show_all()
+        votingWin.fullscreen()
+
+class VotingWindow(Gtk.Window):
+    def __init__(self, voting):
+        Gtk.Window.__init__(self, title=str(voting[0]) + " - " + str(voting[1]))
+
+        try:
+            conn = psycopg2.connect(dbname="decidedb2", user="decide2", password="decide", host="127.0.0.1", port="5432")
+            self.cur = conn.cursor(cursor_factory=psycopg2.extras.NamedTupleCursor)
+            print("Conectado")
+        except Exception as e:
+            print(e)
+
+        self.box = Gtk.Box(spacing=6, orientation="vertical")
+        self.add(self.box)
+
+        self.label = Gtk.Label(label=str(voting[0]) + " - " + str(voting[1]))
+        self.box.pack_start(self.label, True, True, 0)
+        self.label = Gtk.Label(label="Ejemplo de pregunta")
+        self.box.pack_start(self.label, True, True, 0)
+        radioButton1 = Gtk.RadioButton("Opción 1")
+        self.box.pack_start(radioButton1, True, True, 0)
+        radioButton2 = Gtk.RadioButton.new_from_widget(radioButton1)
+        radioButton2.set_label("Opción 2")
+        self.box.pack_start(radioButton2, True, True, 0)
+        radioButton3 = Gtk.RadioButton.new_from_widget(radioButton1)
+        radioButton3.set_label("Opción 3")
+        self.box.pack_start(radioButton3, True, True, 0)
+        '''
+        self.cur.execute("SELECT question_id from voting_voting_question where voting_id = %s", [voting[0]])
+        questionsIdentifiers = self.cur.fetchall()
+
+        questions = []
+        questionsOptions = []
+
+        for questionId in questionsIdentifiers:
+            self.cur.execute("SELECT * from voting_question where id = %s", [questionId[0]])
+            question = self.cur.fetchall()
+            questions.append((question[0][0], question[0][1]))
+
+        for q in questions:
+            self.cur.execute("SELECT * from voting_questionoption where question_id = %s", [q[0]])
+            options = self.cur.fetchall()
+            for option in options:
+                questionsOptions.append((option[0], option[1], option[2], option[3]))
+
+        for q in questions:
+            question_description = Gtk.Label(label="Question: "+str(q[1]))
+            self.box.pack_start(question_description, True, True, 0)
+
+            for option in questionsOptions:
+                i = 0
+                if option[3] == q[0]:
+                    if i == 0:
+                        radioButton1 = Gtk.RadioButton("Option: "+str(option[0]))
+                        self.box.pack_start(radioButton1, True, True, 0)
+                    else:
+                        radioButton2 = Gtk.RadioButton.new_from_widget(radioButton1)
+                        radioButton2.set_label("Option: "+str(option[0]))
+                        self.box.pack_start(radioButton2, True, True, 0)
+        '''
+        sendButton = Gtk.Button.new_with_label("Votar")
+        self.box.pack_start(sendButton, True, True, 0)
+
+    def on_logout_clicked(self, window):
+        user = []
+        Gtk.VotingWindow.destroy()
+
+
+
+def main():
+    app = GUI()
+    Gtk.main()
+
+
+if __name__ == "__main__":
+    sys.exit(main())
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@
		from django.contrib import admin

		# Register your models here.