Skip to content

Commit

Permalink
supervisor menu
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dohko19
Dohko19 committed Mar 18, 2021
1 parent a917783 commit a0469be
Show file tree
Hide file tree
Showing 19 changed files with 262 additions and 5,655 deletions.
16 changes: 16 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5,600 changes: 23 additions & 5,577 deletions .idea/workspace.xml
View file

Large diffs are not rendered by default.

28 changes: 19 additions & 9 deletions platforms/android/app/src/main/assets/www/js/metodos.js
View file
Expand Up @@ -942,7 +942,7 @@ function learn(id)

//-----------------------------------------------------------
function registerQuest(lesson_id, course_id){
stopVideo()
stopVideo();
var now = new Date();
var idCuestionario = localStorage.getItem('idCuestionario');

Expand Down Expand Up @@ -976,7 +976,11 @@ function registerQuest(lesson_id, course_id){
$("#note").hide();
$("#enviarCuestionario").hide();
// $("#success").append('<div style="background-color: forestgreen; color: #FFFFFF;" ><p style="color: #FFFFFF;"> En hora buena.Haz completado este cuestionario, vuelve el dia de mañana para repetirlo</p></div>');
if(courseid >= 78 && courseid <= 99){
if(idCurso >= 78 && idCurso <= 99){

Swal.fire('Enhorabuena!', '¡Haz completado este cuestionario, vuelve el dia de mañana para repetirlo', 'success');
app.views.main.router.navigate( { name: 'TecnicasLimpieza' , params: {id: 2} } );
}else if(idCurso >= 101){

Swal.fire('Enhorabuena!', '¡Haz completado este cuestionario, vuelve el dia de mañana para repetirlo', 'success');
app.views.main.router.navigate( { name: 'TecnicasLimpieza' , params: {id: 2} } );
Expand Down Expand Up @@ -1120,9 +1124,9 @@ function saveQuest(el, ansId)
var length = resultsA.rows.length;
var dateF, questionId, userId;
for(var w = 0; w< length; w++) {
questionId = resultsA.rows.item(w).question_id
dateF = resultsA.rows.item(w).dateF
userId = resultsA.rows.item(w).user_id
questionId = resultsA.rows.item(w).question_id;
dateF = resultsA.rows.item(w).dateF;
userId = resultsA.rows.item(w).user_id;
}

if (length > 0 && questionId == question_id && userId === user_id && dateF === dateY)
Expand All @@ -1140,7 +1144,7 @@ function saveQuest(el, ansId)
}

$('input[name=pregunta'+question_id+']').attr("disabled",true);
})
});
}
else {
tx1.executeSql("INSERT INTO answer_user(idCuestionario, answer, question_id, user_id, answer_id, created_at, dateF ) VALUES (?,?,?,?,?,?,?)",
Expand All @@ -1156,7 +1160,7 @@ function saveQuest(el, ansId)
}
$('input[name=pregunta'+question_id+']').attr("disabled",true);
}
)
);
}
var ql = $('input[name=pregunta'+question_id+']').length;
if (ql > 1){
Expand Down Expand Up @@ -1966,7 +1970,12 @@ function storeLocalA()

async function callStoreAqulif(idcf, course_id)
{
const result = await storeQualification(idcf, course_id)
try {
const result = await storeQualification(idcf, course_id)

}catch (e){
console.log(e)
}

}

Expand Down Expand Up @@ -2015,6 +2024,7 @@ function storeQualification(idcf, course_id)
var long = res.rows.length;
var answers = [];
var repetidos = {};
console.log(long)
if (long > 0) {
for (var z = 0; z < long; z++) {
var item = res.rows.item(z);
Expand Down Expand Up @@ -2063,7 +2073,7 @@ function storeQualification(idcf, course_id)
}
}
else{
toastTop('Hubo un error al guardar LONG', 2500);
toastTop('Hubo un error al guardar LONG in Else', 2500);
}
})
}
Expand Down
77 changes: 61 additions & 16 deletions platforms/android/app/src/main/assets/www/menu.html
View file
Expand Up @@ -215,7 +215,11 @@
</div>
<div id="demo2" class="circle">
<strong></strong>
<span>Calif. Cuestionarios</span>
<span>Cuestionarios Supervisores</span>
</div>
<div id="demo3" class="circle">
<strong></strong>
<span>Cursos OL</span>
</div>
</div>
</center>
Expand Down Expand Up @@ -262,7 +266,11 @@
</a>
</p> -->
<!-- <p class="row"><a href="#" onclick="updateStatusCourse()" id="getCertificado" class="col-100 button button-fill button-large button-raised color-yellow">Obtener Certificado</a></p> -->
<p class="row" id="downloadCertificate"><a href="#" target="_system" onclick="getCertificate()" class="col-100 button button-fill button-large button-raised color-orange">Descargar Certificado</a></p>
<p class="row">
<span id="downloadCertificate">
<a href="#" target="_system" onclick="getCertificate()" class="col-100 button button-fill button-large button-raised color-orange">Descargar Certificado</a>
</span>
</p>

</div>
<div id="presentacion">
Expand Down Expand Up @@ -3093,14 +3101,16 @@

try {
var id = localStorage.getItem("id");
var response2, response;
var response2, response, response3;
if(localStorage.getItem('role_id') == 2 || localStorage.getItem('role_id') == 1)
{
response =
await axios.get('https://serviciosbennetts.com/universidadBennetts/getProgressBar.php?id='+id);

response2 =
await axios.get('https://serviciosbennetts.com/universidadBennetts/getProgressBarSupervisor.php?id='+id);
response3 =
await axios.get('https://serviciosbennetts.com/universidadBennetts/getProgressBar.php?id='+id);
}else{
response = await axios.get('https://serviciosbennetts.com/universidadBennetts/getProgressBar.php?id='+id);
response2 = await axios.get('https://serviciosbennetts.com/universidadBennetts/getProgressCalifBar.php?id='+id);
Expand All @@ -3112,25 +3122,45 @@
else{
var p2 = response2.data;
}
if(response3.data == 'INF' || response3.data == 'NAN')
{
var p3 = 0.0
}
else{
var p3 = response3.data;
}

// var totalBar = p2 + p3;
let dataBarTotal = response2.data / 100;
let dataBarTotal2 = response3.data / 100;
let dataBar = response.data/100; // solo acepta numeros entre 0.1 a 1.0

// let dataBarTotalW = p2 + p3;

if (response2.data >= 90)
{
updateStatusCourse()
// $("#finalQuestions").show();
// updateStatusCourse()
$("#finalQuestions").hide();
$("#getCertificado").show()

let role = localStorage.getItem('role_id')

if(role !== '2' || role != 2){
alert('super')
if (response2.data >= 85 && response3.data >= 85){
$("#finalQuestions").hide();
$("#downloadCertificate").show()
}else{
$("#finalQuestions").hide();
$("#downloadCertificate").hide()
}
}else{
$("#finalQuestions").hide();
// $("#finalQuestions").show();
$("#getCertificado").hide()
if (response2.data >= 85)
{
updateStatusCourse()
// $("#finalQuestions").show();
// updateStatusCourse()
$("#finalQuestions").hide();
$("#downloadCertificate").show()

}else{
$("#finalQuestions").hide();
// $("#finalQuestions").show();
$("#downloadCertificate").hide()
}
}

// if (dataBarTotalW >= 80)
Expand Down Expand Up @@ -3161,11 +3191,26 @@
},
emptyFill: "#929292",
fill: {
gradient: ['#64b519','#35f320']// or color: '#3aeabb', or image: 'http://i.imgur.com/pT0i89v.png'
gradient: ['#ff0000','#8d0404']// or color: '#3aeabb', or image: 'http://i.imgur.com/pT0i89v.png'
},
}).on('circle-animation-progress', function(event, progress) {
$(this).find('strong').html(p2+'%');
});
if(localStorage.getItem('role_id') == 2 || localStorage.getItem('role_id') == 1) {
$('#demo3').circleProgress({ // calificacion general supervisor
value: dataBarTotal2,
animation: {
duration: 1200,
easing: 'circleProgressEasing'
},
emptyFill: "#929292",
fill: {
gradient: ['#64b519', '#35f320']// or color: '#3aeabb', or image: 'http://i.imgur.com/pT0i89v.png'
},
}).on('circle-animation-progress', function (event, progress) {
$(this).find('strong').html(p3 + '%');
});
}
} catch (error) {
console.error(error);
Swal.fire('Warning', 'Ocurrio un error al obtener los datos'+error,'warning')
Expand Down
6 changes: 5 additions & 1 deletion platforms/android/app/src/main/assets/www/pages/cursos/watchVideo.html
View file
Expand Up @@ -44,11 +44,15 @@
'<div class="card">'+
'<div class="card-header" style="font-size: 20px; background-color: #2196f3; color: white;">'+courses_show[i].name+'</div>'+
'<div class="card-content card-content-padding">' +
'<iframe width="100%" height="315" src="'+courses_show[i].video_src+'" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div>'+
'<div id="player" style="width: 100%; height: 315px">' +
'</div>' +
'</div>' +
// '<iframe width="100%" height="315" src="'+courses_show[i].video_src+'" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div>'+
'<div class="card-footer">'+
'</div>'+
'</div>'
);
onYouTubePlayerAPIReady(courses_show[i].created_at)
}

}
Expand Down
3 changes: 1 addition & 2 deletions platforms/android/app/src/main/assets/www/pages/questions/show.html
View file
Expand Up @@ -46,7 +46,7 @@
const answers = JSON.parse(ans);
const questions = JSON.parse(data);
if (questions.length !== 0) {
$("#title").append('<b>'+name+'</b>');
$("#title").append(`<b>${name}</b>`);
$("#enviarCuestionario").append('<button onclick="EnviarCuestionario('+cursoID+', '+catId+')" ' +
'class="link col button button-large button-raised button-fill color-green" id="sendQuest" disabled>' +
'<i class="fas fa-save"></i>' +
Expand All @@ -63,7 +63,6 @@
);
for (let i = 0; i < answers.length; i++) // respuestas
{
console.log(answers[i].question_id)
if (answers[i].question_id == questions[w].id)
{
$("#answers"+w).append(
Expand Down
8 changes: 4 additions & 4 deletions ...src/main/assets/www/pages/supervisor/calificacion_perfil/actividades_administrativas.html
View file
Expand Up @@ -61,17 +61,17 @@
'<i class="icon f7-icons if-not-md">square_arrow_right</i> Iniciar</a>'+
''+
'<span id="watchVidio'+ courses[i].idCourse +'">' +
// '<a class="button" onclick="Verificar2('+courses[i].idCourse+', '+catId+')" href="#"">Repasar la Leccion</a>' +
'<a class="button" onclick="Verificar2('+courses[i].idCourse+', '+catId+')" href="#"">Repasar la Leccion</a>' +
'</span>'+
'</div>' +
// '<div class="card-footer">' +
// '<span class="badge color-red" id="Faprovado'+ courses[i].idCourse+'">Aprobado</span>'+
// '<span class="badge color-green" id="FNoaprovado'+ courses[i].idCourse+'">No Aprobado</span>'+
// '</div>'+
'</div>');
// checkIfCoursesComplete(courses[i].idCourse);
// checkAR(courses[i].idCourse);
// checkQualify(courses[i].idCourse);
checkIfCoursesComplete(courses[i].idCourse);
checkAR(courses[i].idCourse);
checkQualify(courses[i].idCourse);
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions ...ms/android/app/src/main/assets/www/pages/supervisor/calificacion_perfil/competencias.html
View file
Expand Up @@ -61,17 +61,17 @@
'<i class="icon f7-icons if-not-md">square_arrow_right</i> Iniciar</a>'+
''+
'<span id="watchVidio'+ courses[i].idCourse +'">' +
// '<a class="button" onclick="Verificar2('+courses[i].idCourse+', '+catId+')" href="#"">Repasar la Leccion</a>' +
'<a class="button" onclick="Verificar2('+courses[i].idCourse+', '+catId+')" href="#"">Repasar la Leccion</a>' +
'</span>'+
'</div>' +
// '<div class="card-footer">' +
// '<span class="badge color-red" id="Faprovado'+ courses[i].idCourse+'">Aprobado</span>'+
// '<span class="badge color-green" id="FNoaprovado'+ courses[i].idCourse+'">No Aprobado</span>'+
// '</div>'+
'</div>');
// checkIfCoursesComplete(courses[i].idCourse);
// checkAR(courses[i].idCourse);
// checkQualify(courses[i].idCourse);
checkIfCoursesComplete(courses[i].idCourse);
checkAR(courses[i].idCourse);
checkQualify(courses[i].idCourse);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion platforms/android/app/src/main/assets/www/pages/supervisor/calificacion_perfil/cp.html
View file
Expand Up @@ -70,7 +70,7 @@
// '</div>'+
'</div>');
checkIfCoursesComplete(courses[i].idCourse);
// checkAR(courses[i].idCourse);
checkAR(courses[i].idCourse);
checkQualify(courses[i].idCourse);
}
}
Expand Down
3 changes: 1 addition & 2 deletions platforms/android/app/src/main/assets/www/pages/supervisor/supervisor.html
View file
Expand Up @@ -24,15 +24,14 @@
let catId = 3;
$('#calif-perfil').append(''+
' <div class="page-content">' +
' <div class="block-title" style="font-weight: bold; font-size: 18px">Calificacion de Perfil</div>' +
' <div class="block-title" style="font-weight: bold; font-size: 20px; color: #0c82df">Calificacion de Perfil</div>' +
' <div class="card">' +
'<div class="card-content">'+
'<div class="list links-list no-ios-edges">'+
' <ul>'+
' <li><a href="/calif_perfil/3">Curso Calificacion de Perfil</a></li>'+
' <li><a href="/competencias/3">Competencias</a></li>'+
' <li><a href="/actividades_administrativas/3">Actividades Administrativas</a></li>'+
' <li><a href="/supervisores-evaluacion/3">Evaluacion a Supervisores</a></li>'+
'</ul>'+
'</div>'+
'</div>'+
Expand Down
29 changes: 29 additions & 0 deletions plugin-list.txt
View file
@@ -0,0 +1,29 @@
cordova-plugin-background-mode 0.7.3 "BackgroundMode"
cordova-plugin-battery-status 2.0.2 "Battery"
cordova-plugin-camera 4.0.3 "Camera"
cordova-plugin-console 1.1.0 "Console"
cordova-plugin-contacts 3.0.1 "Contacts"
cordova-plugin-device-motion 2.0.1 "Device Motion"
cordova-plugin-device-orientation 2.0.1 "Device Orientation"
cordova-plugin-device 2.0.2 "Device"
cordova-plugin-dialogs 2.0.1 "Notification"
cordova-plugin-downloader 0.0.4 "Downloader"
cordova-plugin-enable-cleartext-traffic 2.1.0 "Internet Status"
cordova-plugin-file-downloader 0.4.0 "Downloader"
cordova-plugin-file-md5 0.3.3 "MD5 Checksum"
cordova-plugin-file-transfer 1.7.1 "File Transfer"
cordova-plugin-file 6.0.1 "File"
cordova-plugin-geolocation 4.0.1 "Geolocation"
cordova-plugin-globalization 1.11.0 "Globalization"
cordova-plugin-inappbrowser 3.0.0 "InAppBrowser"
cordova-plugin-media-capture 3.0.2 "Capture"
cordova-plugin-network-information 2.0.1 "Network Information"
cordova-plugin-screen-orientation 3.0.1 "Screen Orientation"
cordova-plugin-splashscreen 5.0.2 "Splashscreen"
cordova-plugin-sqlite-2 1.0.6 "SQLitePlugin"
cordova-plugin-vibration 3.1.0 "Vibration"
cordova-plugin-whitelist 1.3.3 "Whitelist"
cordova-plugin-zip 3.1.0 "cordova-plugin-zip"
cordova-sqlite-storage 3.2.0 "Cordova sqlite storage plugin - cordova-sqlite-storage plugin version"
cordova.plugins.diagnostic 5.0.1 "Diagnostic"
es6-promise-plugin 4.2.2 "Promise"

0 comments on commit a0469be

Please sign in to comment.