mirror of https://github.com/acanas/swad-core.git
Version 14.74.7
This commit is contained in:
parent
c518a9d423
commit
633e51ea3f
|
@ -36,17 +36,17 @@
|
||||||
// Sería completa esta aplicación, si la asistencia se incluyera, automáticamente, en el apartado de evaluación de cada alumno. De esta forma podríamos ver sus trabajos y asistencias de forma personalizada.
|
// Sería completa esta aplicación, si la asistencia se incluyera, automáticamente, en el apartado de evaluación de cada alumno. De esta forma podríamos ver sus trabajos y asistencias de forma personalizada.
|
||||||
// TODO: OpenSWAD.org: ¿Qué debería tener una buena gestión de grupos? Es para tomar ideas ;)
|
// TODO: OpenSWAD.org: ¿Qué debería tener una buena gestión de grupos? Es para tomar ideas ;)
|
||||||
// José Raúl Canay @raulcanay: por ejemplo, que puedas sacar un listado exportable de en qué grupos está una persona de quienes están en un grupo.
|
// José Raúl Canay @raulcanay: por ejemplo, que puedas sacar un listado exportable de en qué grupos está una persona de quienes están en un grupo.
|
||||||
// TODO: Remove debug in PRADO
|
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 14.74.6 (2015/02/08)"
|
#define Log_PLATFORM_VERSION "SWAD 14.74.7 (2015/02/08)"
|
||||||
|
|
||||||
// Number of lines (includes comments but not blank lines) has been got with the following command:
|
// 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 | tail -1
|
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h | tail -1
|
||||||
/*
|
/*
|
||||||
|
Version 14.74.7: Feb 08, 2015 Link to register/remove several users. (178029 lines)
|
||||||
Version 14.74.6: Feb 08, 2015 Changes in layout of form to register/remove one user. (178009 lines)
|
Version 14.74.6: Feb 08, 2015 Changes in layout of form to register/remove one user. (178009 lines)
|
||||||
Version 14.74.5: Feb 08, 2015 Changes in layout of form to register/remove users. (178038 lines)
|
Version 14.74.5: Feb 08, 2015 Changes in layout of form to register/remove users. (178038 lines)
|
||||||
Version 14.74.4: Feb 08, 2015 Changes in layout of form to register/remove users. (178000 lines)
|
Version 14.74.4: Feb 08, 2015 Changes in layout of form to register/remove users. (178000 lines)
|
||||||
|
|
|
@ -88,7 +88,7 @@ extern struct Globals Gbl;
|
||||||
|
|
||||||
static void Enr_ShowFormRegRemSeveralUsrs (void);
|
static void Enr_ShowFormRegRemSeveralUsrs (void);
|
||||||
|
|
||||||
static void Enr_PutFormToRemOldUsrs (void);
|
static void Enr_PutLinkToRemOldUsrs (void);
|
||||||
static void Enr_PutAreaToEnterUsrsIDs (void);
|
static void Enr_PutAreaToEnterUsrsIDs (void);
|
||||||
static bool Enr_PutActionsRegRemOneUsr (bool ItsMe);
|
static bool Enr_PutActionsRegRemOneUsr (bool ItsMe);
|
||||||
static void Enr_PutActionsRegRemSeveralUsrs (void);
|
static void Enr_PutActionsRegRemSeveralUsrs (void);
|
||||||
|
@ -97,9 +97,10 @@ static void Enr_RegisterUsr (struct UsrData *UsrDat,Rol_Role_t RegRemRole,
|
||||||
struct ListCodGrps *LstGrps,unsigned *NumUsrsRegistered);
|
struct ListCodGrps *LstGrps,unsigned *NumUsrsRegistered);
|
||||||
static void Enr_MarkOfficialStdsAsRemovable (long ImpGrpCod,bool RemoveSpecifiedUsrs);
|
static void Enr_MarkOfficialStdsAsRemovable (long ImpGrpCod,bool RemoveSpecifiedUsrs);
|
||||||
|
|
||||||
static void Enr_PutFormToRemAllStdsThisCrs (void);
|
static void Enr_PutLinkToRemAllStdsThisCrs (void);
|
||||||
static void Enr_RemoveEnrollmentRequest (long CrsCod,long UsrCod);
|
static void Enr_RemoveEnrollmentRequest (long CrsCod,long UsrCod);
|
||||||
static void Enr_PutFormToAdminOneUsr (void);
|
static void Enr_PutLinkToAdminOneUsr (void);
|
||||||
|
static void Enr_PutLinkToAdminSeveralUsrs (void);
|
||||||
|
|
||||||
static void Enr_ReqAnotherUsrIDToRegisterRemove (void);
|
static void Enr_ReqAnotherUsrIDToRegisterRemove (void);
|
||||||
static void Enr_AskIfRegRemMe (void);
|
static void Enr_AskIfRegRemMe (void);
|
||||||
|
@ -500,7 +501,7 @@ void Enr_ReqAdminUsrs (void)
|
||||||
static void Enr_ShowFormRegRemSeveralUsrs (void)
|
static void Enr_ShowFormRegRemSeveralUsrs (void)
|
||||||
{
|
{
|
||||||
extern const char *The_ClassTitle[The_NUM_THEMES];
|
extern const char *The_ClassTitle[The_NUM_THEMES];
|
||||||
extern const char *Txt_Admin_users;
|
extern const char *Txt_Admin_several_users;
|
||||||
extern const char *Txt_Step_1_Provide_a_list_of_users;
|
extern const char *Txt_Step_1_Provide_a_list_of_users;
|
||||||
extern const char *Txt_Option_a_Import_students_from_the_official_lists;
|
extern const char *Txt_Option_a_Import_students_from_the_official_lists;
|
||||||
extern const char *Txt_Select_the_groups_of_students_you_want_to_register_in_remove_from_this_course;
|
extern const char *Txt_Select_the_groups_of_students_you_want_to_register_in_remove_from_this_course;
|
||||||
|
@ -515,21 +516,24 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
|
||||||
extern const char *Txt_Confirm;
|
extern const char *Txt_Confirm;
|
||||||
bool ExternalUsrsServiceAvailable = (Cfg_EXTERNAL_LOGIN_CLIENT_COMMAND[0] != '\0');
|
bool ExternalUsrsServiceAvailable = (Cfg_EXTERNAL_LOGIN_CLIENT_COMMAND[0] != '\0');
|
||||||
|
|
||||||
|
/***** Put contextual links *****/
|
||||||
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
|
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
|
||||||
|
|
||||||
/***** Put form to go to admin one user *****/
|
/* Put link to go to admin one user */
|
||||||
Enr_PutFormToAdminOneUsr ();
|
Enr_PutLinkToAdminOneUsr ();
|
||||||
|
|
||||||
/***** Put link to remove all the students in the current course *****/
|
/* Put link to remove all the students in the current course */
|
||||||
if (Gbl.CurrentCrs.Crs.CrsCod > 0) // Course selected
|
if (Gbl.CurrentCrs.Crs.CrsCod > 0) // Course selected
|
||||||
Enr_PutFormToRemAllStdsThisCrs ();
|
Enr_PutLinkToRemAllStdsThisCrs ();
|
||||||
|
|
||||||
/***** Put link to remove old users *****/
|
/* Put link to remove old users */
|
||||||
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)
|
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)
|
||||||
Enr_PutFormToRemOldUsrs ();
|
Enr_PutLinkToRemOldUsrs ();
|
||||||
|
|
||||||
|
fprintf (Gbl.F.Out,"<div>");
|
||||||
|
|
||||||
/***** Start frame *****/
|
/***** Start frame *****/
|
||||||
Lay_StartRoundFrameTable10 (NULL,2,Txt_Admin_users);
|
Lay_StartRoundFrameTable10 (NULL,2,Txt_Admin_several_users);
|
||||||
fprintf (Gbl.F.Out,"<tr>"
|
fprintf (Gbl.F.Out,"<tr>"
|
||||||
"<td>");
|
"<td>");
|
||||||
|
|
||||||
|
@ -614,8 +618,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
|
||||||
Lay_PutSendButton (Txt_Confirm);
|
Lay_PutSendButton (Txt_Confirm);
|
||||||
|
|
||||||
/***** End of form *****/
|
/***** End of form *****/
|
||||||
fprintf (Gbl.F.Out,"</form>"
|
fprintf (Gbl.F.Out,"</form>");
|
||||||
"</div>");
|
|
||||||
|
|
||||||
/***** End frame *****/
|
/***** End frame *****/
|
||||||
fprintf (Gbl.F.Out,"</td>"
|
fprintf (Gbl.F.Out,"</td>"
|
||||||
|
@ -627,7 +630,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
|
||||||
/******************** Put a link (form) to remove old users ******************/
|
/******************** Put a link (form) to remove old users ******************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
static void Enr_PutFormToRemOldUsrs (void)
|
static void Enr_PutLinkToRemOldUsrs (void)
|
||||||
{
|
{
|
||||||
extern const char *The_ClassFormul[The_NUM_THEMES];
|
extern const char *The_ClassFormul[The_NUM_THEMES];
|
||||||
extern const char *Txt_Remove_old_users;
|
extern const char *Txt_Remove_old_users;
|
||||||
|
@ -778,7 +781,7 @@ static void Enr_PutAreaToEnterUsrsIDs (void)
|
||||||
"%s: "
|
"%s: "
|
||||||
"</td>"
|
"</td>"
|
||||||
"<td style=\"text-align:left;\">"
|
"<td style=\"text-align:left;\">"
|
||||||
"<textarea name=\"UsrsIDs\" cols=\"80\" rows=\"20\">",
|
"<textarea name=\"UsrsIDs\" cols=\"90\" rows=\"15\">",
|
||||||
The_ClassFormul[Gbl.Prefs.Theme],
|
The_ClassFormul[Gbl.Prefs.Theme],
|
||||||
Txt_List_of_nicks_emails_or_IDs);
|
Txt_List_of_nicks_emails_or_IDs);
|
||||||
|
|
||||||
|
@ -1711,7 +1714,7 @@ static void Enr_MarkOfficialStdsAsRemovable (long ImpGrpCod,bool RemoveSpecified
|
||||||
/**** Put a link (form) to remove all the students in the current course *****/
|
/**** Put a link (form) to remove all the students in the current course *****/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
static void Enr_PutFormToRemAllStdsThisCrs (void)
|
static void Enr_PutLinkToRemAllStdsThisCrs (void)
|
||||||
{
|
{
|
||||||
extern const char *The_ClassFormul[The_NUM_THEMES];
|
extern const char *The_ClassFormul[The_NUM_THEMES];
|
||||||
extern const char *Txt_Remove_all_students;
|
extern const char *Txt_Remove_all_students;
|
||||||
|
@ -2575,7 +2578,7 @@ static void Enr_RemoveEnrollmentRequest (long CrsCod,long UsrCod)
|
||||||
/********************** Write a form to admin one user ***********************/
|
/********************** Write a form to admin one user ***********************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
static void Enr_PutFormToAdminOneUsr (void)
|
static void Enr_PutLinkToAdminOneUsr (void)
|
||||||
{
|
{
|
||||||
extern const char *The_ClassFormul[The_NUM_THEMES];
|
extern const char *The_ClassFormul[The_NUM_THEMES];
|
||||||
extern const char *Txt_Admin_one_user;
|
extern const char *Txt_Admin_one_user;
|
||||||
|
@ -2586,6 +2589,21 @@ static void Enr_PutFormToAdminOneUsr (void)
|
||||||
fprintf (Gbl.F.Out,"</form>");
|
fprintf (Gbl.F.Out,"</form>");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/******************* Write a form to admin several users *********************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
static void Enr_PutLinkToAdminSeveralUsrs (void)
|
||||||
|
{
|
||||||
|
extern const char *The_ClassFormul[The_NUM_THEMES];
|
||||||
|
extern const char *Txt_Admin_several_users;
|
||||||
|
|
||||||
|
Act_FormStart (ActReqMdfSevUsr);
|
||||||
|
Act_LinkFormSubmit (Txt_Admin_several_users,The_ClassFormul[Gbl.Prefs.Theme]);
|
||||||
|
Lay_PutSendIcon ("configtest",Txt_Admin_several_users,Txt_Admin_several_users);
|
||||||
|
fprintf (Gbl.F.Out,"</form>");
|
||||||
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/************** Form to request the user's ID of another user ****************/
|
/************** Form to request the user's ID of another user ****************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
@ -2642,11 +2660,19 @@ static void Enr_ReqAnotherUsrIDToRegisterRemove (void)
|
||||||
{
|
{
|
||||||
extern const char *Txt_Admin_one_user;
|
extern const char *Txt_Admin_one_user;
|
||||||
|
|
||||||
/***** Put link to remove old users *****/
|
/***** Put contextual links *****/
|
||||||
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)
|
if (Gbl.CurrentCrs.Crs.CrsCod > 0 ||
|
||||||
|
Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
|
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
|
||||||
Enr_PutFormToRemOldUsrs ();
|
|
||||||
|
if (Gbl.CurrentCrs.Crs.CrsCod > 0)
|
||||||
|
/* Put link to go to admin several users */
|
||||||
|
Enr_PutLinkToAdminSeveralUsrs ();
|
||||||
|
else if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)
|
||||||
|
/* Put link to remove old users */
|
||||||
|
Enr_PutLinkToRemOldUsrs ();
|
||||||
|
|
||||||
fprintf (Gbl.F.Out,"</div>");
|
fprintf (Gbl.F.Out,"</div>");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
20
swad_text.c
20
swad_text.c
|
@ -1873,25 +1873,25 @@ const char *Txt_Admin_user =
|
||||||
"Gerenciar utilizador";
|
"Gerenciar utilizador";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const char *Txt_Admin_users =
|
const char *Txt_Admin_several_users =
|
||||||
#if L==0
|
#if L==0
|
||||||
"Administrar usuaris";
|
"Administrar diversos usuaris";
|
||||||
#elif L==1
|
#elif L==1
|
||||||
"Verwalten Benutzern";
|
"Verwalten Sie mehrere Benutzer";
|
||||||
#elif L==2
|
#elif L==2
|
||||||
"Admin users";
|
"Admin several users";
|
||||||
#elif L==3
|
#elif L==3
|
||||||
"Administrar usuarios";
|
"Administrar varios usuarios";
|
||||||
#elif L==4
|
#elif L==4
|
||||||
"Gérer utilisateurs";
|
"Gérer plusieurs utilisateurs";
|
||||||
#elif L==5
|
#elif L==5
|
||||||
"Administrar usuarios"; // Okoteve traducción
|
"Administrar varios usuarios"; // Okoteve traducción
|
||||||
#elif L==6
|
#elif L==6
|
||||||
"Gestire utenti";
|
"Gestire più utenti";
|
||||||
#elif L==7
|
#elif L==7
|
||||||
"Zarządzaj użytkownikow";
|
"Zarządzaj wielu użytkowników";
|
||||||
#elif L==8
|
#elif L==8
|
||||||
"Gerenciar utilizadores";
|
"Gerenciar vários utilizadores";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const char *Txt_All =
|
const char *Txt_All =
|
||||||
|
|
Loading…
Reference in New Issue