Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 16.135.5

This commit is contained in:
Antonio Cañas Vargas 2017-02-11 17:13:08 +01:00
parent 1a437d79d2
commit 2f533889d4
6 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_changelog.h
View File

@ -190,19 +190,20 @@
// TODO: Ver solución de Guillermo Gómez Trenado cuando se pulsa con el botón derecho para abrir una descarga en otra ventana
// TODO: En los detalles de asistencia debería salir la fecha de cada sesión
// TODO: Botón "Inscribir profesores" cuando no hay profesores --> Botón "Inscribir profesor/a"
/*****************************************************************************/
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.135.4 (2017-02-11)"
#define Log_PLATFORM_VERSION "SWAD 16.135.5 (2017-02-11)"
#define CSS_FILE "swad16.135.css"
#define JS_FILE "swad16.123.js"
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/*
Version 16.135.5: Feb 11, 2017 Change in button to register teacher when no teachers found.
Changed color in statistics of countries. (212503 lines)
Version 16.135.4: Feb 11, 2017 Force filling of ID in form to check if account exists. (212502 lines)
Version 16.135.3: Feb 09, 2017 Code refactoring related to enrolling teachers and students. (212499 lines)
Version 16.135.2: Feb 09, 2017 Changes in layout of stats on degrees. (212456 lines)

2
swad_country.c
View File

@ -874,7 +874,7 @@ void Cty_WriteScriptGoogleGeochart (void)
" height:300,\n"
" backgroundColor:'white',\n"
" datalessRegionColor:'white',\n"
" colorAxis:{colors:['white','black'],minValue:0,maxValue:%u}};\n"
" colorAxis:{colors:['white','#4D88A1'],minValue:0,maxValue:%u}};\n"
" var chart = new google.visualization.GeoChart(document.getElementById('chart_div'));\n"
" chart.draw(data, options);\n"
" };\n"

8
swad_enrollment.c
View File

@ -157,16 +157,16 @@ void Enr_PutButtonToEnrollStudents (void)
/**************** Show form with button to enroll teachers *******************/
/*****************************************************************************/
void Enr_PutButtonToEnrollTeachers (void)
void Enr_PutButtonToEnrollOneTeacher (void)
{
extern const char *Txt_Register_teachers;
extern const char *Txt_Register_teacher;
/***** Form to enroll several students *****/
if (Gbl.CurrentCrs.Crs.CrsCod > 0 && // Course selected
Gbl.Usrs.Me.LoggedRole >= Rol_DEG_ADM) // I am an administrator
{
Act_FormStart (ActReqEnrSevTch);
Lay_PutConfirmButton (Txt_Register_teachers);
Act_FormStart (ActReqMdfOneTch);
Lay_PutConfirmButton (Txt_Register_teacher);
Act_FormEnd ();
}
}

2
swad_enrollment.h
View File

@ -70,7 +70,7 @@ typedef enum
/*****************************************************************************/
void Enr_PutButtonToEnrollStudents (void);
void Enr_PutButtonToEnrollTeachers (void);
void Enr_PutButtonToEnrollOneTeacher (void);
void Enr_PutLinkToRequestSignUp (void);

20
swad_text.c
View File

@ -30695,25 +30695,25 @@ const char *Txt_Register_the_users_indicated_in_step_1_and_remove_the_users_not_
" e registrar os utilizadores que estão na lista";
#endif
const char *Txt_Register_teachers =
const char *Txt_Register_teacher =
#if L==1
"Inscriure professors";
"Inscriure professor/a";
#elif L==2
"Anmeldung Lehrkräfte";
"Anmeldung Lehrkraft";
#elif L==3
"Register teachers";
"Register teacher";
#elif L==4
"Inscribir profesores";
"Inscribir profesor/a";
#elif L==5
"Inscrire enseignants";
"Inscrire enseignant/e";
#elif L==6
"Inscribir profesores"; // Okoteve traducción
"Inscribir profesor/a"; // Okoteve traducción
#elif L==7
"Registrare professori";
"Registrare professore/ssa";
#elif L==8
"Rejestracja nauczycieli";
"Rejestracja nauczyciel";
#elif L==9
"Registrar professores";
"Registrar professor/a";
#endif
const char *Txt_Register_user_IN_A_COURSE_OR_DEGREE =

8
swad_user.c
View File

@ -6021,8 +6021,8 @@ static void Usr_ListMainDataTchs (bool PutCheckBoxToSelectUsr)
/***** Show warning indicating no teachers found *****/
Usr_ShowWarningNoUsersFound (Rol_TEACHER);
/***** Button to enroll teachers *****/
Enr_PutButtonToEnrollTeachers ();
/***** Button to enroll a teacher *****/
Enr_PutButtonToEnrollOneTeacher ();
}
/***** Free memory for teachers list *****/
@ -7557,8 +7557,8 @@ void Usr_SeeTeachers (void)
/***** Show warning indicating no teachers found *****/
Usr_ShowWarningNoUsersFound (Rol_TEACHER);
/***** Button to enroll teachers *****/
Enr_PutButtonToEnrollTeachers ();
/***** Button to enroll a teacher *****/
Enr_PutButtonToEnrollOneTeacher ();
}
/***** End frame *****/