Skip to content

yotta / pictogram

Go to a project
Commit 0828fa6f by Arturo Montejo Ráez
Options

Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop

parents 2406e79c c2718338
Expand all
Inline Side-by-side
Showing with 158 additions and 39 deletions
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/PCBDBHelper.java
......@@ -90,7 +90,7 @@ public class PCBDBHelper extends SQLiteOpenHelper {
private void setCurrentUser(User user) {
this.currentUser = user;
PCBcontext.getDevice().setLastStuId(user.get_id_stu());
PCBcontext.getDevice().setLastSupId(user.get_id_sup());
if (user.is_supervisor()) PCBcontext.getDevice().setLastSupId(user.get_id_sup());
}
/**
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/NetService.java
package com.yottacode.pictogram.net;
import android.content.Intent;
import android.util.Log;
import com.yottacode.net.RestapiWrapper;
......@@ -98,6 +99,10 @@ public class NetService implements Runnable {
PCBcontext.unset_user();
this.device.restart_app();
}
public void restart_app(Intent intent) {
PCBcontext.unset_user();
this.device.restart_app(intent);
}
/**
* ping to the server by using a restapi call. If ok, the call will return the empty set
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/iNetServiceDevice.java
package com.yottacode.pictogram.net;
import android.content.Intent;
/**
* Created by Fernando on 12/08/2016.
*/
......@@ -9,4 +11,5 @@ public interface iNetServiceDevice {
public void notifyStatus(boolean updated);
public void closeNotifyStatus();
public void restart_app();
public void restart_app(Intent intent);
}
android/Pictogram/commonlibrary/src/main/res/raw/pcbdb_create.sql
......@@ -209,8 +209,8 @@ INSTEAD OF INSERT ON users_detail
FOR EACH ROW
WHEN NEW.pwd_stu IS NULL
BEGIN
INSERT OR REPLACE INTO student(id,nickname, name, surname, url_img, gender, lang, attributes)
VALUES (NEW.id_stu, NEW.nickname_stu, NEW.name_stu, NEW.surname_stu, NEW.url_img_stu, NEW.gender_stu, NEW.lang_stu, NEW.attributes_stu);
INSERT OR REPLACE INTO student(id,nickname, pwd, name, surname, url_img, gender, lang, attributes)
VALUES (NEW.id_stu, NEW.nickname_stu, (SELECT pwd FROM student WHERE id=NEW.id_stu), NEW.name_stu, NEW.surname_stu, NEW.url_img_stu, NEW.gender_stu, NEW.lang_stu, NEW.attributes_stu);
INSERT OR REPLACE INTO supervisor VALUES (NEW.id_sup, NEW.email_sup, NEW.pwd_sup, NEW.name_sup, NEW.surname_sup, NEW.url_img_sup, NEW.gender_sup, NEW.lang_sup, NEW.tts_engine_sup);
INSERT OR REPLACE INTO users VALUES (NEW.id_stu,NEW.id_sup);
END
......
android/Pictogram/tablet/src/main/java/com/yottacode/pictogram/tablet/gui/PictogramActivity.java
......@@ -6,6 +6,7 @@ import android.content.ClipData;
import android.content.ClipDescription;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
......@@ -31,6 +32,7 @@ import android.widget.ImageButton;
import android.widget.RelativeLayout;
import android.widget.Toast;
import com.yottacode.pictogram.dao.User;
import com.yottacode.pictogram.net.iImgDownloaderListener;
import com.yottacode.pictogram.tablet.R;
import com.yottacode.pictogram.action.PictosAction;
......@@ -43,18 +45,22 @@ import com.yottacode.pictogram.net.PictoUploader;
import com.yottacode.pictogram.tools.Img;
import com.yottacode.pictogram.tools.PCBcontext;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
public class PictogramActivity extends Activity implements iVocabularyListener, TextToSpeech.OnInitListener {
public static final String PREFS_NAME = "MyPrefsFile";
// Main layout for this activity
RelativeLayout mainLayout;
// Adapter for de grid showing the categories grid (and main pictos)
......@@ -736,13 +742,54 @@ public class PictogramActivity extends Activity implements iVocabularyListener,
private class OnDeleteButtonLongClickListener implements View.OnLongClickListener {
@Override
public boolean onLongClick(View v) {
count_deletelong++;
count_deletelong++;
if (count_deletelong >= 3) {
//TODO: COMPROBAR SI LOS USUARIOS QUE BUSCO EXISTEN: SI NO PONER LOS DATOS POR DEFECTO*******************************************************************/
//Cojo los id del ultimo estudiante y el ultimo supervisor
int lastIdStu = PCBcontext.getDevice().getLastStuId();
User actual = PCBcontext.getPcbdb().getCurrentUser();
User usuario_anterior;
String lastUserName = null;
String lastPassword= null;
if (count_deletelong >= 3) {
PictogramActivity.this.finish();
PCBcontext.getNetService().restart_app();
if (actual.is_supervisor()) //Si el que habia es supervisor busco el ultimo niño
try {
usuario_anterior = PCBcontext.getDevice().findUser(lastIdStu,User.NO_SUPERVISOR);
if(usuario_anterior!=null){
lastUserName = usuario_anterior.get_nickname_stu();
lastPassword = usuario_anterior.get_pwd_stu();
}
} catch (JSONException e) {
e.printStackTrace();
}
else {
int lastIdSup = PCBcontext.getDevice().getLastSupId();
try {
usuario_anterior = PCBcontext.getDevice().findUser(lastIdStu,lastIdSup);
if(usuario_anterior!=null){
lastUserName = usuario_anterior.get_email_sup();
lastPassword = usuario_anterior.get_pwd_sup();
}
} catch (JSONException e) {
e.printStackTrace();
}
}
return false;
Intent serialActivity = new Intent(getBaseContext(), SerialActivity.class);
if (lastUserName!=null) {
Log.i(this.getClass().getCanonicalName(), "Switch user to "+ lastUserName);
serialActivity.putExtra("switch_usr", lastUserName);
serialActivity.putExtra("switch_pwd", lastPassword);
}
PictogramActivity.this.finish();
PCBcontext.getNetService().restart_app(serialActivity);
}
return false;
}
}
......
android/Pictogram/tablet/src/main/java/com/yottacode/pictogram/tablet/gui/SerialActivity.java
......@@ -4,6 +4,7 @@ import android.app.Activity;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.Window;
......@@ -25,12 +26,24 @@ public class SerialActivity extends Activity {
// String constant for logs
private final String LOG_TAG = this.getClass().getSimpleName(); // Or .getCanonicalName()
public static void resetDefaultUser() {
SharedPreferences settings = PCBcontext.getContext().getSharedPreferences(PREFS_NAME, 0);
SharedPreferences.Editor editor = settings.edit();
editor.putString("username", "");
editor.putString("password", "");
/**
* Return the default user+pwd when login.The policy is
* 1. switch user
* 2. last user
* @return user+pwd to be used
*/
private String[] loginUserPolicy() {
Intent intent=getIntent();
String username = intent.getStringExtra("switch_usr");
String password = intent.getStringExtra("switch_pwd");
if (username==null) {
SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0);
username = settings.getString("username", "");
password = settings.getString("password", "");
}
return new String[]{username,password};
}
@Override
protected void onCreate(Bundle savedInstanceState) {
......@@ -38,21 +51,25 @@ public class SerialActivity extends Activity {
requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.activity_serial);
Intent intent=getIntent();
final EditText mSerialViewMail = (EditText) findViewById(R.id.serialmail);
final EditText mSerialViewPass = (EditText) findViewById(R.id.serialpass);
SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0);
String username = settings.getString("username", "");
String password = intent.getBooleanExtra("resetPrevUser", true) ? "" : settings.getString("password", "");
String default_user[]=loginUserPolicy();
String username=default_user[0];
String password=default_user[1];
// Escribo el último valor indicado de username
mSerialViewMail.setText(username);
mSerialViewPass.setText(password);
// Escribo el último valor indicado de username
mSerialViewMail.setText(username);
if (!username.equals("") && !password.equals("")) new UserLogin().login(username, password,SerialActivity.this, PictogramActivity.class, LoginActivity.class);;
if (!username.equals("") && !password.equals("") && !getIntent().getBooleanExtra("resetPrevUser", true)) new UserLogin().login(username, password,SerialActivity.this, PictogramActivity.class, LoginActivity.class);
Button mEntrarButton = (Button) findViewById(R.id.entrar_button);
mEntrarButton.setOnClickListener(new OnClickListener() {
......@@ -66,6 +83,7 @@ public class SerialActivity extends Activity {
editor.putString("username", username);
editor.putString("password", password);
editor.commit();
if (!username.equals("") && !password.equals(""))
new UserLogin().login(username, password,SerialActivity.this, PictogramActivity.class, LoginActivity.class);
}
});
......
android/Pictogram/tablet/src/main/java/com/yottacode/pictogram/tablet/net/NetServiceTablet.java
......@@ -4,6 +4,7 @@ import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.TaskStackBuilder;
import android.content.Intent;
import android.support.v4.app.Fragment;
import android.support.v4.app.NotificationCompat;
import android.util.Log;
......@@ -68,15 +69,13 @@ public class NetServiceTablet implements iNetServiceDevice {
* the app. The most frequent reason is a password change while the user have been logged
* offline
*/
public void restart_app() {
public void restart_app(Intent serialActivity) {
StackTraceElement trace[] = Thread.currentThread().getStackTrace();
Log.i(this.getClass().getCanonicalName(),"App restarted from "+trace[0]+"->"+trace[1]+"..."+
trace[trace.length-2]+"->"+trace[trace.length-1]);
SerialActivity.resetDefaultUser();
Intent serialActivity = new Intent(PCBcontext.getContext(), SerialActivity.class);
Log.i(this.getClass().getCanonicalName(),"App restarting");
if (serialActivity==null) serialActivity = new Intent(PCBcontext.getContext(), SerialActivity.class);
serialActivity.putExtra("resetPrevUser", true);
PCBcontext.getContext().startActivity(serialActivity);
}
public void restart_app() {restart_app(null);}
}
android/Pictogram/watch/src/main/java/com/yottacode/pictogram/watch/gui/MainActivity.java
......@@ -47,8 +47,8 @@ public class MainActivity extends Activity {
}
private void login() {
final String username="faf0001";
final String password="faf0001";
final String username="faf0002";
final String password="faf0002";
new UserLogin().login(username,password,this, MainActivity.class,null);
}
}
android/Pictogram/watch/src/main/java/com/yottacode/pictogram/watch/net/NetServiceWatch.java
......@@ -43,13 +43,17 @@ public class NetServiceWatch implements iNetServiceDevice {
* offline
*/
public void restart_app() {
Intent intent= new Intent(PCBcontext.getContext(), Activity);
intent.putExtra("resetPrevUser", true);
PCBcontext.getContext().startActivity(intent);
restart_app(new Intent(PCBcontext.getContext(), Activity));
}
@Override
public void restart_app(Intent intent) {
intent.putExtra("resetPrevUser", true);
PCBcontext.getContext().startActivity(intent);
}
public void set_notifyTextView(TextView _notifyTextView) {
public void set_notifyTextView(TextView _notifyTextView) {
this.status = _notifyTextView;
}
}
sails/roles/database/files/triggers-sessions-integrity-constraints.sql
......@@ -89,7 +89,9 @@ thisTrigger: BEGIN
NOW(3)
)
ON DUPLICATE KEY UPDATE id_stu=idstu, id_sup=idsup, id_ws=NEW.id_ws, id_opentry=NEW.id;
END;;
--
-- It deletes current try for a given session
DROP PROCEDURE IF EXISTS deleteOpenTry;
......@@ -117,6 +119,7 @@ AFTER INSERT ON working_session
FOR EACH ROW
thisTrigger: BEGIN
DECLARE idstu INT;
DECLARE ins_begin DATE;
IF ((@TRIGGER_CHECKS = FALSE)
OR (@TRIGGER_AFTER_INSERT_CHECKS = FALSE))
......@@ -125,9 +128,25 @@ thisTrigger: BEGIN
LEAVE thisTrigger;
END IF;
UPDATE instruction
SET status='started'
WHERE id=new.id_ins;
SELECT begin INTO ins_begin
FROM instruction
WHERE id = NEW.id_ins;
IF (ins_begin IS NULL) THEN
UPDATE instruction
SET
begin = NOW(3),
end = NOW(3)
WHERE
id = NEW.id_ins;
END IF;
UPDATE instruction
SET
status='started',
end = NOW(3)
WHERE
id = NEW.id_ins;
INSERT INTO try(`id_ws`)
VALUES (new.id);
......@@ -150,6 +169,16 @@ thisTrigger: BEGIN
LEAVE thisTrigger;
END IF;
-- end date for related instruction is updated
IF (OLD.end < NEW.end) THEN
UPDATE instruction
SET
end = NEW.end
WHERE
id = NEW.id_ins;
END IF;
-- remove open try
IF ((old.end IS NULL) and (new.end IS NOT NULL)) THEN
CALL deleteOpenTry(new.id);
END IF;
......@@ -335,6 +364,8 @@ thisTrigger: BEGIN
WHERE id = NEW.id_ws;
END IF;
END;;
......
sails/src/assets/app/bower.json
......@@ -26,7 +26,7 @@
"ngtoast": "~1.5.4",
"angular-animate": "~1.4.1",
"angular-sanitize": "~1.4.1",
"angular-chart.js": "~0.7.2",
"angular-chart.js": "latest",
"ng-lodash": "~0.3.0"
},
"resolutions": {
......
sails/src/assets/app/i18n/en-gb.json
......@@ -26,6 +26,7 @@
"alert": "Alert",
"all": "All",
"animation": "Animation",
"annual": "Annual",
"April": "April",
"attributes_not_updated": "Changes not saved",
"attributes_updated": "Changes saved",
......@@ -102,6 +103,7 @@
"general_labels": "General labels",
"generate": "Generate",
"generate_serial": "Generate serial number",
"global":"Global",
"hide": "Hide",
"highlight": "highlight",
"highlighted": "Highlighted",
......@@ -142,6 +144,7 @@
"methods": "Methods",
"minutes": "minutes",
"month_totals": "Month totals",
"monthly":"Monthly",
"name": "Name",
"new_instruction": "New instruction",
"new_method": "New method",
......@@ -269,10 +272,12 @@
"tag_deleted": "Tag deleted",
"tape_background": "Tape background",
"template_deleted": "Template deleted",
"time_instruction_method": "Time instructions of method",
"time_hours": "Time: {{hours}} hours",
"time_instruction_method": "Time instructions of method",
"time_sessions_total": "Total sessions time",
"time_sessions_per_days": "Time of sessions per days in",
"time_sessions_per_month": "Time of sessions per months in",
"time_tries_total": "Total tries time",
"time_tries_per_days": "Time of tries per days in",
"time_tries_per_month": "Time of tries per months in",
"title": "Title",
......@@ -281,6 +286,7 @@
"tpl_day": "{{ day | date:'yyyy-MM-dd' }}",
"tpl_hours_frame": "from {{ begin | date:'HH:mm:ss' }} to {{ end | date:'HH:mm:ss' }}",
"tries": "Tries",
"tries_done": "Tries done",
"tries_length": "Tries length",
"tries_mean_length": "Tries mean length",
"tries_per_days": "Tries per days in",
......
sails/src/assets/app/i18n/es-es.json
......@@ -26,6 +26,7 @@
"alert": "Alerta",
"all": "Todos",
"animation": "Animación",
"annual": "Anual",
"April": "Abril",
"attributes_not_updated": "Cambios no guardados",
"attributes_updated": "Cambios guardados",
......@@ -102,6 +103,7 @@
"general_labels": "Generales",
"generate": "Generar",
"generate_serial": "Generar número de serie",
"global":"Global",
"hide": "Ocultar",
"highlight": "Resaltar",
"highlighted": "Resaltado",
......@@ -142,6 +144,7 @@
"methods": "Métodos",
"minutes": "minutos",
"month_totals": "Totales mes",
"monthly":"Mensual",
"name": "Nombre",
"new_instruction": "Nueva instrucción",
"new_method": "Nuevo método",
......@@ -272,8 +275,10 @@
"template_deleted": "Plantilla eliminada",
"time_hours": "Tiempo: {{hours}} horas",
"time_instruction_method": "Tiempo instrucciones del método",
"time_sessions_total": "Tiempo total de sesiones",
"time_sessions_per_days": "Tiempo de sesiones por días en",
"time_sessions_per_month": "Tiempo de sesiones por meses en",
"time_tries_total": "Tiempo total de ensayos",
"time_tries_per_days": "Tiempo de ensayos por días en",
"time_tries_per_month": "Tiempo de ensayos por meses en",
"title": "Título",
......@@ -282,6 +287,7 @@
"tpl_day": "{{ day | date:'dd-MM-yyyy' }}",
"tpl_hours_frame": "de {{ begin | date:'HH:mm:ss' }} a {{ end | date:'HH:mm:ss' }}",
"tries": "Ensayos",
"tries_done": "Ensayos realizados",
"tries_length": "Duración ensayos",
"tries_mean_length": "Duración media ensayos",
"tries_per_days": "Número de ensayos por días en",
......
sails/src/assets/scripts/app.js
......@@ -16,7 +16,7 @@ var dashboardApp = angular.module('dashboardApp', [
'ngAnimate',
'ngSanitize',
'ngToast',
'chart.js',
'Chart.js',
'ngLodash'
]);
......
sails/src/assets/scripts/modules/student/views/addpicto.html
<div>
<div class="modal-header">
<div class="btn-group">
<button class="btn btn-default" ng-model="source" uib-btn-radio="'symbolstx'" ng-click="open_category_from_bc('0')">Symbolstx</button>
<button class="btn btn-default" ng-model="source" uib-btn-radio="'symbolstx'" ng-click="open_category_from_bc('0')">SymbolStix</button>
<button class="btn btn-default" ng-model="source" uib-btn-radio="'ownpictos'" ng-click="load_own_pictos()" translate>own_pictos</button>
</div>
</div>
......
sails/src/assets/styles/main.less
......@@ -2,7 +2,6 @@
@import (less) '../app/bower_components/bootstrap/dist/css/bootstrap-theme.css';
@import (less) '../app/bower_components/ngtoast/dist/ngToast.css';
@import (less) '../app/bower_components/ngtoast/dist/ngToast-animations.css';
@import (less) '../app/bower_components/angular-chart.js/dist/angular-chart.css';
@import (less) 'cropper.css';
@import (less) 'main.css';
@import (less) 'font-awesome.min.css';
......
sails/src/package.json
......@@ -7,6 +7,7 @@
"dependencies": {
"async": "^2.0.0-rc.4",
"bcrypt-nodejs": "0.0.3",
"chart.js": "^2.3.0",
"connect-redis": "3.0.2",
"connect-timeout": "^1.7.0",
"ejs": "^0.8.8",
......
sails/src/tasks/config/concat.js
......@@ -21,7 +21,7 @@ module.exports = function (grunt) {
'assets/app/bower_components/angular-sanitize/angular-sanitize.js',
'assets/app/bower_components/ngtoast/dist/ngToast.js',
'assets/app/bower_components/Chart.js/Chart.js',
'assets/app/bower_components/chart.js/dist/Chart.js',
'assets/app/bower_components/angular-chart.js/dist/angular-chart.js',
'assets/app/bower_components/ng-lodash/build/ng-lodash.js',
'assets/app/bower_components/ng-file-upload/angular-file-upload-shim.js',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment