From ac0613b20594357b079d10d6ace327632a1bdddb Mon Sep 17 00:00:00 2001
From: Victor Mocelin <vm13@inf.ufpr.br>
Date: Mon, 18 Apr 2016 15:39:01 -0300
Subject: [PATCH] Arrumada view que lista as pessoas. Fixes #6.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Adicionado campo timestamp na tabela de presença.
---
www/js/app.js | 2 +-
www/js/controllers.js | 2 +-
www/js/services.js | 2 +-
www/templates/listaDePresenAEventoX.html | 4 +++-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/www/js/app.js b/www/js/app.js
index f5655f3..929cca0 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -23,6 +23,6 @@ angular.module('app', ['ionic', 'app.controllers', 'app.routes', 'app.services',
var db = $cordovaSQLite.openDB({name: 'ceitificator.db', iosDatabaseLocation: 'default'});
$cordovaSQLite.execute(db, "CREATE TABLE IF NOT EXISTS people(id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT NOT NULL, grr TEXT NOT NULL, email TEXT NOT NULL, UNIQUE (name, grr, email))");
$cordovaSQLite.execute(db, "CREATE TABLE IF NOT EXISTS events(id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, name TEXT NOT NULL, desc TEXT NOT NULL, date TEXT NOT NULL, place TEXT NOT NULL, hours TEXT NOT NULL, UNIQUE (name, desc, date, place, hours))");
- $cordovaSQLite.execute(db, "CREATE TABLE IF NOT EXISTS people_events(event_id, person_id, FOREIGN KEY(event_id) REFERENCES events(id), FOREIGN KEY(person_id) REFERENCES people(id), UNIQUE (person_id, event_id))");
+ $cordovaSQLite.execute(db, "CREATE TABLE IF NOT EXISTS people_events(event_id, person_id, timestamp DATETIME DEFAULT CURRENT_TIMESTAMP, FOREIGN KEY(event_id) REFERENCES events(id), FOREIGN KEY(person_id) REFERENCES people(id), UNIQUE (person_id, event_id))");
});
})
diff --git a/www/js/controllers.js b/www/js/controllers.js
index d95694d..7340a09 100644
--- a/www/js/controllers.js
+++ b/www/js/controllers.js
@@ -82,7 +82,7 @@ angular.module('app.controllers', [])
$scope.eventX.place + "\n" +
$scope.eventX.hours + "\n";
- for (var i = 0; i < $scope.people.length; i++){
+ for (var i = 0; i < $scope.people.length; i++) {
string += $scope.people[i].name + "#" +
$scope.people[i].email + "\n";
}
diff --git a/www/js/services.js b/www/js/services.js
index 634471f..420a19f 100644
--- a/www/js/services.js
+++ b/www/js/services.js
@@ -66,7 +66,7 @@ angular.module('app.services', [])
var people = [];
var db = $cordovaSQLite.openDB({name: 'ceitificator.db',
iosDatabaseLocation: 'default'});
- $cordovaSQLite.execute(db, "SELECT people.* FROM people, people_events WHERE people.id=people_events.person_id AND people_events.event_id=" + eventId)
+ $cordovaSQLite.execute(db, "SELECT people.* FROM people, people_events WHERE people.id=people_events.person_id AND people_events.event_id=" + eventId + " ORDER BY timestamp DESC")
.then(function(res) {
for(var i = 0; i < res.rows.length; i++) {
people.push(res.rows.item(i));
diff --git a/www/templates/listaDePresenAEventoX.html b/www/templates/listaDePresenAEventoX.html
index e9537fd..e248f16 100644
--- a/www/templates/listaDePresenAEventoX.html
+++ b/www/templates/listaDePresenAEventoX.html
@@ -12,7 +12,9 @@
<button id="listaDePresenAEventoX-button2" class="button button-positive button-block icon-right ion-ios-download" on-touch="storeData()">Salvar para arquivo</button>
<button id="listaDePresenAEventoX-button1" class="button button-positive button-block icon-right ion-qr-scanner" on-touch="scan()">Adicionar</button>
<ion-list>
- <ion-item ng-repeat="person in people">{{person.name}} - {{person.grr}} - {{person.email}}</ion-item>
+ <ion-item ng-repeat="person in people">{{person.name}}<br>
+ GRR{{person.grr}}<br>
+ {{person.email}}</ion-item>
</ion-list>
</div>
</div>
--
GitLab