Skip to content

Dev #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MarcMerino wants to merge 23 commits into
base: dev_dani
Choose a base branch
from
Open

Dev #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
c1ef351
Merge pull request #4 from Matrics-App/dev
Xavi-PL May 10, 2021
287db51
ADDED: Align-Right formularios de requisitos, semaforo gris
Xavi-PL May 10, 2021
8594167
FIXED: Modal subir ficheros
Xavi-PL May 10, 2021
63a296b
Nuevo aspecto modal subir ficheros
Xavi-PL May 10, 2021
3bac716
Mas bonito todo :D
Xavi-PL May 10, 2021
cc88c32
Prueba camara
Xavi-PL May 11, 2021
ea5bfaa
reqPhoto + reqGallery
Xavi-PL May 11, 2021
157c869
Merge pull request #7 from Matrics-App/dev
MarcMerino May 11, 2021
a0298b8
Merge pull request #8 from Matrics-App/dev
MarcMerino May 11, 2021
8b5e5d6
Merge branch 'dev_xavi' into dev
MarcMerino May 11, 2021
364597a
Fixed some merge issues
MarcMerino May 11, 2021
037b65e
Merge pull request #11 from Matrics-App/dev_marc
MarcMerino May 11, 2021
a198c4c
Merge pull request #13 from Matrics-App/dev
MarcMerino May 11, 2021
d4f08fc
login con API
gerser2000 May 12, 2021
c023631
login con api
gerser2000 May 12, 2021
ae620cc
fail arreglado
gerser2000 May 12, 2021
42afdcf
datos de usuario con api
gerser2000 May 12, 2021
bc86a79
Merge pull request #14 from Matrics-App/dev
MarcMerino May 12, 2021
ed6f777
Designing modal for Login Helper
MarcMerino May 12, 2021
3561bdf
Merge branch 'dev_marc' of https://github.com/Matrics-App/app into de…
MarcMerino May 12, 2021
c408a35
Finished design of Login Helper
MarcMerino May 13, 2021
daf2545
Merge pull request #15 from Matrics-App/dev_marc
MarcMerino May 13, 2021
46a6b7a
Merge pull request #18 from AWS2/dev_gerard
gerser2000 May 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
"cordova": {
"plugins": {
"cordova-plugin-whitelist": {},
"cordova-plugin-camera": {
"ANDROID_SUPPORT_V4_VERSION": "27.+"
},
"cordova-plugin-camera": {},
"cordova-plugin-statusbar": {},
"cordova-plugin-navigationbar-color": {}
},
Expand Down
2 changes: 1 addition & 1 deletion www/css/materialize.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6070,7 +6070,7 @@ body.keyboard-focused .dropdown-content li:focus {
margin: 0;
width: 100%;
max-height: 45%;
border-radius: 0;
border-radius: 20px 20px 0px 0px;
will-change: bottom, opacity;
}

Expand Down
44 changes: 31 additions & 13 deletions www/css/materialize.min.css
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion www/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,11 @@ body {
padding-right: 1em;
}

/* Transforms: */
.custom-transform-vertical-translate {
transform: translate(0%, -50%) !important;
}

/* Borders: */
.custom-border-none {
border: none !important;
Expand Down Expand Up @@ -362,5 +367,8 @@ blockquote {
.custom-blur {
-webkit-filter: blur(5px);
filter: blur(5px);

}

.waves-effect.waves-blue .waves-ripple {
background-color: rgba(161, 225, 255, 0.48);
}
49 changes: 22 additions & 27 deletions www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<!-- cordova-headers -->
<meta http-equiv="Content-Security-Policy"
content="default-src https://sis-t.redsys.es:25443/sis https://accounts.google.com https://apis.google.com/js/platform.js https://apis.google.com https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/crypto-js.min.js https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js https://fonts.gstatic.com 'self' data: gap: https://ssl.gstatic.com 'unsafe-eval'; style-src https://fonts.googleapis.com 'self' 'unsafe-inline'; media-src *; img-src 'self' data: content:;">
content="default-src http://34.203.46.101:8000 https://sis-t.redsys.es:25443/sis https://accounts.google.com https://apis.google.com/js/platform.js https://apis.google.com https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/crypto-js.min.js https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js https://fonts.gstatic.com 'self' data: gap: https://ssl.gstatic.com 'unsafe-eval'; style-src https://fonts.googleapis.com 'self' 'unsafe-inline'; media-src *; img-src 'self' data: content:;">
<meta name="format-detection" content="telephone=no">
<meta name="msapplication-tap-highlight" content="no">

Expand All @@ -19,8 +19,7 @@
</head>

<body id="body">
<nav id="navbar" class="nav-extended blue custom-border-radius-bottom custom-width-100 custom-margin-auto"
role="navigation">
<nav id="navbar" class="nav-extended blue custom-border-radius-bottom custom-width-100 custom-margin-auto" role="navigation">
<div class="nav-wrapper container"><a id="logo-container" href="#" class="brand-logo center blue-text-gradient">Matrics IETI</a></div>
<div class="nav-content">
<ul class="tabs blue tabs-fixed-width blue-gradient-180">
Expand Down Expand Up @@ -123,32 +122,28 @@ <h5 id="titleHint" class="custom-h5">Tasques a fer:</h5>

<!-- Tab Requisits -->
<div id="reqTab" class="container custom-padding-top-1em custom-width-80">

<div id="paneProfile" class="container">
<h4 id="userProfile">#PERFIL</h4>
</div>

<div id="paneRequisits" class="container right-align">

</div>


<div id="paneRequisits" class="right-align"></div>

<div id="reqModal" class="modal bottom-sheet">
<div class="modal-content">
<div class="modal-content custom-padding-1em">
<h4>MatriculaT</h4>
<div id="reqModalGallery" style="display:flex; flex-direction:row;">
<i class="material-icons circle blue-text custom-icon-padding">camera_alt</i>
<p>Fer una fotgrafia</p>
<div class="custom-padding-top-1em" style="display:flex; flex-direction:row;">
<a id="reqPhoto" style="border-radius: 20px;" class="waves-effect waves-light btn blue-gradient"><i class="material-icons left">camera_alt</i>FES-HI UNA FOTO!</a>
</div>
<div id="reqModalGallery" style="display:flex; flex-direction:row;">
<i class="material-icons circle blue-text custom-icon-padding">image</i>
<p>Pujar una imatge</p>
<div class="custom-padding-top-1em" style="display:flex; flex-direction:row;">
<a id="reqGallery" style="border-radius: 20px;" class="waves-effect waves-light btn blue-gradient"><i class="material-icons left">photo</i>PUJA UNA FOTOGRAFIA!</a>
</div>
<div id="reqModalGallery" style="display:flex; flex-direction:row;">
<i class="material-icons circle blue-text custom-icon-padding">file_upload</i>
<p>Pujar un fitxer</p>
<div class="custom-padding-top-1em" style="display:flex; flex-direction:row;">
<a id="reqFile" style="border-radius: 20px;" class="waves-effect waves-light btn blue-gradient"><i class="material-icons left">file_upload</i>PUJA UN FITXER!</a>
</div>
</div>
<div class="modal-footer">
<a href="#!" class="modal-close waves-effect waves-green btn-flat">Agree</a>
<a href="#!" class="modal-close waves-effect waves-green btn-flat">Tanca!</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -180,11 +175,11 @@ <h5 class="center-align">Jardineria i floristeria</h5>
<tbody>
<tr>
<td class="custom-padding-left-1em">Descompte:</td>
<td class="right-align custom-padding-right-1em">40,25€</td>
<td id="paymentDiscount" class="right-align custom-padding-right-1em">40,25€</td>
</tr>
<tr>
<td class="custom-padding-left-1em">Preu total:</td>
<td class="right-align custom-padding-right-1em">200€</td>
<td id="paymentPrice" class="right-align custom-padding-right-1em">200€</td>
</tr>
</tbody>
</table>
Expand All @@ -201,16 +196,16 @@ <h5 class="center-align">Jardineria i floristeria</h5>

<!-- Tab Dades -->
<div id="dadesTab" class="container custom-padding-top-1em custom-width-80">
<div class="custom-border custom-border-radius custom-scroll-y">
<table >
<div class="custom-margin-top-1em custom-border custom-border-radius custom-scroll-y" style="max-height: 65vh;">
<table>
<tbody>
<tr>
<th class="custom-padding-left-1em">Nombre</th>
<td id="dadesNombre" style="white-space: break-spaces; overflow-wrap: anywhere;">---</td>
<th class="custom-padding-left-1em">Nom</th>
<td id="dadesNom" style="white-space: break-spaces; overflow-wrap: anywhere;">---</td>
</tr>
<tr>
<th class="custom-padding-left-1em">Apellidos</th>
<td id="dadesApellidos" style="white-space: break-spaces; overflow-wrap: anywhere;">---</td>
<th class="custom-padding-left-1em">Cognoms</th>
<td id="dadesCognoms" style="white-space: break-spaces; overflow-wrap: anywhere;">---</td>
</tr>
<tr>
<th class="custom-padding-left-1em">Document d'identificaci&oacute;</th>
Expand Down
49 changes: 42 additions & 7 deletions www/js/fitxersController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
getRequisits();

document.addEventListener("deviceready", onDeviceReady, false);
function onDeviceReady() {
document.getElementById("reqPhoto").onclick = function () {
navigator.camera.getPicture(onSuccess, onFail, setOptions(1));
}

document.getElementById("reqGallery").onclick = function () {
navigator.camera.getPicture(onSuccess, onFail, setOptions(0));
}
}

function getRequisits(){

var arrayStatus = ['<div class="valign-wrapper"><td class="center"><i class="material-icons circle red-text custom-icon-padding">brightness_1</i><i style="opacity:0.3" class="material-icons circle amber-text custom-icon-padding">brightness_1</i><i style="opacity:0.3" class="material-icons circle light-green-text custom-icon-padding">brightness_1</i></td></div>',
'<div class="valign-wrapper"><td class="center"><i style="opacity:0.3" class="material-icons circle red-text custom-icon-padding">brightness_1</i><i class="material-icons circle amber-text custom-icon-padding">brightness_1</i><i style="opacity:0.3" class="material-icons circle light-green-text custom-icon-padding">brightness_1</i></td></div>',
'<div class="valign-wrapper"><td class="center"><i style="opacity:0.3" class="material-icons circle red-text custom-icon-padding">brightness_1</i><i style="opacity:0.3" class="material-icons circle amber-text custom-icon-padding">brightness_1</i><i class="material-icons circle light-green-text custom-icon-padding">brightness_1</i></td></div>',
'<div class="valign-wrapper"><td class="center"><i style="opacity:0.3" class="material-icons circle red-text custom-icon-padding">brightness_1</i><i style="opacity:0.3" class="material-icons circle amber-text custom-icon-padding">brightness_1</i><i style="opacity:0.3" class="material-icons circle light-green-text custom-icon-padding">brightness_1</i></td></div>']

var arrayStatus = ['<div class="valign-wrapper"><td class="center"><i style="opacity:0.3" class="material-icons circle gray-text custom-icon-padding">brightness_1</i><i class="material-icons circle red-text custom-icon-padding">brightness_1</i><i style="opacity:0.3" class="material-icons circle amber-text custom-icon-padding">brightness_1</i><i style="opacity:0.3" class="material-icons circle light-green-text custom-icon-padding">brightness_1</i></td></div>',
'<div class="valign-wrapper"><td class="center"><i style="opacity:0.3" class="material-icons circle gray-text custom-icon-padding">brightness_1</i><i style="opacity:0.3" class="material-icons circle red-text custom-icon-padding">brightness_1</i><i class="material-icons circle amber-text custom-icon-padding">brightness_1</i><i style="opacity:0.3" class="material-icons circle light-green-text custom-icon-padding">brightness_1</i></td></div>',
'<div class="valign-wrapper"><td class="center"><i style="opacity:0.3" class="material-icons circle gray-text custom-icon-padding">brightness_1</i><i style="opacity:0.3" class="material-icons circle red-text custom-icon-padding">brightness_1</i><i style="opacity:0.3" class="material-icons circle amber-text custom-icon-padding">brightness_1</i><i class="material-icons circle light-green-text custom-icon-padding">brightness_1</i></td></div>',
'<div class="valign-wrapper"><td class="center"><i style="opacity:1" class="material-icons circle gray-text custom-icon-padding">brightness_1</i><i style="opacity:0.3" class="material-icons circle red-text custom-icon-padding">brightness_1</i><i style="opacity:0.3" class="material-icons circle amber-text custom-icon-padding">brightness_1</i><i style="opacity:0.3" class="material-icons circle light-green-text custom-icon-padding">brightness_1</i></td></div>']

var paneRequisits = $('#paneRequisits');
var arrayRequisits = ["DNI ANVERS","DNI REVERS","SANITARIA"];
Expand All @@ -15,14 +27,37 @@ function getRequisits(){
"class": "custom-padding-1em",
"method": "GET",
"id": "formRequisit" + i,
"html": '<div style="display:flex; flex-direction:row;"><h6 id="nameRequisit' + i + '">' + arrayRequisits[i] + '</h6><a id="btnRequisit' + i + '" class="custom-margin-left-1em custom-border-radius blue-gradient waves-effect waves-light btn">AFEGEIX!</a>' + arrayStatus[i]
"html": '<div style="justify-content: flex-end; display:flex; flex-direction:row;"><h6 id="nameRequisit' + i + '">' + arrayRequisits[i] + '</h6><a id="btnRequisit' + i + '" class="custom-margin-left-1em custom-border-radius blue-gradient waves-effect waves-light btn">AFEGEIX!</a>' + arrayStatus[i]
}).appendTo(paneRequisits);

document.getElementById("btnRequisit" + i).onclick = function (ev, nomReq = arrayRequisits[i]) {

var reqModal = document.getElementById("reqModal");
var instance = M.Modal.getInstance(reqModal);
var instance = M.Modal.init(reqModal);
instance.open();
setStatus(statusR, 2, 0);
}
}
}

function setOptions(srcType) {
var options = {
quality: 100,
destinationType: Camera.DestinationType.DATA_URL,
sourceType: srcType,
encodingType: Camera.EncodingType.JPEG,
mediaType: Camera.MediaType.PICTURE,
allowEdit: true,
correctOrientation: true,
direction: Camera.Direction.BACK
}
return options;
}

function onSuccess(imageData) {
var image = "data:image/jpeg;base64," + imageData;
console.log(image);
}

function onFail(message) {
alert('Failed because: ' + message);
}
63 changes: 45 additions & 18 deletions www/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@

document.addEventListener('deviceready', onDeviceReady, false);

// Booleanos generales:
let skipWizard = true;

// Variables generales:
let body = document.getElementById("body");

Expand All @@ -33,10 +36,11 @@ let hintRequisits = $("#dashboardInfoRequisits");
let saveUFsButton = $("#saveUFsButton");

// Variables Tab Dades:
let userData =JSON.parse('{"nombre":"dani","apellido1":"ronda","apellido2":"palasi","dni":"46465871K","birthplace":"Barcelona","birthday":"01/08/2000","address":"plz milagros consarnau sabate 15 4 3","city":"Hospitalet","postal_code":"54815","phone_number":"936558741","emergency_number":"98563221","tutor_1":"dani powenwne jhjdwcmokwd","tutor_2":"safiupbdvsapi dsaihadvsiunl"}');
// let userData =JSON.parse('{"nombre":"dani","apellido1":"ronda","apellido2":"palasi","dni":"46465871K","birthplace":"Barcelona","birthday":"01/08/2000","address":"plz milagros consarnau sabate 15 4 3","city":"Hospitalet","postal_code":"54815","phone_number":"936558741","emergency_number":"98563221","tutor_1":"dani powenwne jhjdwcmokwd","tutor_2":"safiupbdvsapi dsaihadvsiunl"}');




// Booleanos generales:
let skipWizard = true;

// Modal variables:
let modalBtn = $("#wizard-floating-btn");
Expand Down Expand Up @@ -76,10 +80,10 @@ function onDeviceReady() {
checkExpandables();

//Load user data
getUserData();
getUserData(localStorage.getItem("token"));

saveUFsButton.on('click', function() {
setUfs();
setUfs("esto es para que falle", "", "text");
});
}

Expand Down Expand Up @@ -227,7 +231,7 @@ function setUfs(url, query, token){
url: url + query,
datatype: String,
data: ({
token: token === undefined ? "" : token
token: token
})
}).done(function(xhr) {
console.log(xhr.status);
Expand Down Expand Up @@ -256,18 +260,41 @@ function addUf(idModule, idUf, ufName) {

// Funciones Tab Dades:
function getUserData(){
$("#dadesNombre")[0].innerHTML=userData.nombre;
$("#dadesApellidos")[0].innerHTML=userData.apellido1;
$("#dadesDNI")[0].innerHTML=userData.dni;
$("#dadesLlocNaixement")[0].innerHTML=userData.birthplace;
$("#dadesNaixement")[0].innerHTML=userData.birthday;
$("#dadesDireccio")[0].innerHTML=userData.address;
$("#dadesCiutat")[0].innerHTML=userData.city;
$("#dadesCodiPostal")[0].innerHTML=userData.postal_code;
$("#dadesTelefon")[0].innerHTML=userData.phone_number;
$("#dadesTelefonEmergencia")[0].innerHTML=userData.emergency_number;
$("#dadesTutor1")[0].innerHTML=userData.tutor_1;
$("#dadesTutor2")[0].innerHTML=userData.tutor_2;
console.log(localStorage.getItem("token"));
$.ajax({
method: "GET",
url: "http://34.203.46.101:8000/api/token",
datatype: String,
headers: {
"Authorization": "Token " + localStorage.getItem("token")
}
}).done(function(userData) {
$("#dadesNom")[0].innerHTML=userData.first_name ? userData.first_name : "-";
$("#dadesCognoms")[0].innerHTML=userData.last_name ? userData.last_name : "-";
$("#dadesDNI")[0].innerHTML=userData.dni ? userData.dni : "-";
$("#dadesLlocNaixement")[0].innerHTML=userData.birthplace ? userData.birthplace : "-";
$("#dadesNaixement")[0].innerHTML=userData.birthday ? userData.birthday : "-";
$("#dadesDireccio")[0].innerHTML=userData.address ? userData.address : "-";
$("#dadesCiutat")[0].innerHTML=userData.city ? userData.city : "-";
$("#dadesCodiPostal")[0].innerHTML=userData.postal_code ? userData.postal_code : "-";
$("#dadesTelefon")[0].innerHTML=userData.phone_number ? userData.phone_number : "-";
$("#dadesTelefonEmergencia")[0].innerHTML=userData.emergency_number ? userData.emergency_number : "-";
$("#dadesTutor1")[0].innerHTML=userData.tutor_1 ? userData.tutor_1 : "-";
$("#dadesTutor2")[0].innerHTML=userData.tutor_2 ? userData.tutor_2 : "-";
setStatus(statusU, 1);
}).fail(function() {
setStatus(statusU, 2);
sendToast("No s'ha pogut connectar amb el servidor. Si us plau torna a intentar-ho m\u00E9s tard.");
}).always(function() {

});


// window.location.href = "index.html";




}

// Funciones generales:
Expand Down
16 changes: 11 additions & 5 deletions www/js/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@

// Loading modal options:
var modalLoading = document.querySelectorAll('#loading');
M.Modal.init(modalLoading, {opacity: 0.5, dismissible: false, endingTop: '35%'});
M.Modal.init(modalLoading, {opacity: 0.5, dismissible: false, endingTop: '50%'});

// Login helper modal options:
var modalHelper = document.querySelectorAll('#loginHelper');
M.Modal.init(modalHelper, {opacity: 0.7, dismissible: true, endingTop: '50%'});

// Wizard modal css:
$(".modal-content").css("padding", "0px");
Expand All @@ -18,12 +22,17 @@
// Loading modal css:
$("#loading").css("padding", "2em");
$("#loading").css("overflow", "hidden");
$("#loading").addClass("custom-transform-vertical-translate");
$("#loading").addClass("custom-border-radius");

$(".preloader-wrapper").css("display", "block");
$(".preloader-wrapper").css("margin", "auto");
$(".preloader-wrapper").css("margin-bottom", "2em");

// Login helper modal css:
$("#loginHelper").css("overflow", "hidden");
$("#loginHelper").addClass("custom-transform-vertical-translate");
$("#loginHelper").addClass("custom-border-radius");

// Para cambiar el click de cancelar en el pago. Hara que vuelva a la aplicacion (WIP)
$("#divImgCancelar").on("click", function() {window.location.href = "javascript:history.back()"});

Expand All @@ -33,9 +42,6 @@
$('.fixed-action-btn').floatingActionButton();
});

//Load user data
getUserData();

}); // end of document ready
})(jQuery); // end of jQuery name space

Expand Down
Loading