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.194.14

This commit is contained in:
Antonio Cañas Vargas 2017-04-28 13:10:46 +02:00
parent 379bba6aec
commit 21a2d7d5e8
4 changed files with 28 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -221,13 +221,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.194.13 (2017-04-28)"
#define Log_PLATFORM_VERSION "SWAD 16.194.14 (2017-04-28)"
#define CSS_FILE "swad16.193.4.css"
#define JS_FILE "swad16.181.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.194.14:Apr 28, 2017 Changed dialog to remove a group. (218368 lines)
Version 16.194.13:Apr 28, 2017 Changed dialog to remove a social note. (218417 lines)
Version 16.194.12:Apr 28, 2017 Changed dialog to remove a social comment. (218398 lines)
Version 16.194.11:Apr 28, 2017 Changed dialog to remove a notice. (218379 lines)

2
swad_global.h
View File

@ -459,7 +459,7 @@ struct Globals
unsigned NumGrps;
struct GroupTypes GrpTypes;
struct GroupType GrpTyp;
long GrpCod;
long GrpCod; // Group to be edited, removed...
char GrpName[Grp_MAX_BYTES_GROUP_NAME + 1];
unsigned MaxStudents;
bool Open;

36
swad_group.c
View File

@ -94,10 +94,13 @@ static bool Grp_CheckIfGroupTypeNameExists (const char *GrpTypName,long GrpTypCo
static bool Grp_CheckIfGroupNameExists (long GrpTypCod,const char *GrpName,long GrpCod);
static void Grp_CreateGroupType (void);
static void Grp_CreateGroup (void);
static void Grp_AskConfirmRemGrpTypWithGrps (unsigned NumGrps);
static void Grp_AskConfirmRemGrp (void);
static void Grp_PutParamRemGrp (void);
static void Grp_RemoveGroupTypeCompletely (void);
static void Grp_RemoveGroupCompletely (void);
static void Grp_WriteMaxStdsGrp (unsigned MaxStudents);
static long Grp_GetParamGrpTypCod (void);
static long Grp_GetParamGrpCod (void);
@ -3388,12 +3391,15 @@ static void Grp_AskConfirmRemGrp (void)
struct GroupData GrpDat;
unsigned NumStds;
/***** Get name and type of the group from database *****/
/***** Get name of the group from database *****/
GrpDat.GrpCod = Gbl.CurrentCrs.Grps.GrpCod;
Grp_GetDataOfGroupByCod (&GrpDat);
/***** Count number of students in group *****/
NumStds = Grp_CountNumStdsInGrp (Gbl.CurrentCrs.Grps.GrpCod);
/***** Write message to ask confirmation of removing *****/
/***** Show question and button to remove group *****/
/* Start alert */
if (NumStds == 0)
sprintf (Gbl.Message,Txt_Do_you_really_want_to_remove_the_group_X,
GrpDat.GrpName);
@ -3403,19 +3409,27 @@ static void Grp_AskConfirmRemGrp (void)
else
sprintf (Gbl.Message,Txt_Do_you_really_want_to_remove_the_group_X_Y_students_,
GrpDat.GrpName,NumStds);
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
Lay_ShowAlertAndButton1 (Lay_QUESTION,Gbl.Message);
/***** Put button to confirm the removing *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
Act_FormStart (ActRemGrp);
Grp_PutParamGrpCod (GrpDat.GrpCod);
Lay_PutRemoveButton (Txt_Remove_group);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
/* End alert */
Lay_ShowAlertAndButton2 (ActRemGrp,NULL,Grp_PutParamRemGrp,
Lay_REMOVE_BUTTON,Txt_Remove_group);
/***** Show the form again *****/
Grp_ReqEditGroups ();
}
/*****************************************************************************/
/****************************** Remove a group type **************************/
/*********************** Put parameter to remove a group *********************/
/*****************************************************************************/
static void Grp_PutParamRemGrp (void)
{
Grp_PutParamGrpCod (Gbl.CurrentCrs.Grps.GrpCod);
}
/*****************************************************************************/
/**************************** Remove a group type ****************************/
/*****************************************************************************/
void Grp_RemoveGroupType (void)

60
swad_text.c
View File

@ -9180,66 +9180,6 @@ const char *Txt_Do_you_really_want_to_remove_the_following_post =
"Voc&ecirc; realmente deseja remover o seguinte post?";
#endif
const char *Txt_Do_you_really_want_to_remove_the_following_user_as_an_administrator_of_the_centre_X = // Warning: it is very important to include %s in the following sentences
#if L==1
"&iquest;Realmente desea eliminar el siguiente usuario"
" como administrador/a del centro <strong>%s</strong>?"; // Necessita traduccio
#elif L==2
"Do you really want to remove the following user"
" as an administrator of the centre <strong>%s</strong>?"; // Need Übersetzung
#elif L==3
"Do you really want to remove the following user"
" as an administrator of the centre <strong>%s</strong>?";
#elif L==4
"&iquest;Realmente desea eliminar el siguiente usuario"
" como administrador/a del centro <strong>%s</strong>?";
#elif L==5
"Do you really want to remove the following user"
" as an administrator of the centre <strong>%s</strong>?"; // Besoin de traduction
#elif L==6
"&iquest;Realmente desea eliminar el siguiente usuario"
" como administrador/a del centro <strong>%s</strong>?"; // Okoteve traducción
#elif L==7
"Vuoi realmente rimuovere il seguente utente"
" come amministratore del centro <strong>%s</strong>?";
#elif L==8
"Czy na pewno chcesz usunac nastepujace u&zdot;ytkownika"
" jako administratora centrum <strong>%s</strong>?";
#elif L==9
"Do you really want to remove the following user"
" as an administrator of the centre <strong>%s</strong>?"; // Necessita de tradução
#endif
const char *Txt_Do_you_really_want_to_remove_the_following_user_as_an_administrator_of_the_degree_X = // Warning: it is very important to include %s in the following sentences
#if L==1
"&iquest;Realmente desea eliminar el siguiente usuario"
" como administrador/a de la titulaci&oacute;n <strong>%s</strong>?"; // Necessita traduccio
#elif L==2
"Do you really want to remove the following user"
" as an administrator of the degree <strong>%s</strong>?"; // Need Übersetzung
#elif L==3
"Do you really want to remove the following user"
" as an administrator of the degree <strong>%s</strong>?";
#elif L==4
"&iquest;Realmente desea eliminar el siguiente usuario"
" como administrador/a de la titulaci&oacute;n <strong>%s</strong>?";
#elif L==5
"Do you really want to remove the following user"
" as an administrator of the degree <strong>%s</strong>?"; // Besoin de traduction
#elif L==6
"&iquest;Realmente desea eliminar el siguiente usuario"
" como administrador/a de la titulaci&oacute;n <strong>%s</strong>?"; // Okoteve traducción
#elif L==7
"Vuoi realmente rimuovere il seguente utente"
" come amministratore della laurea <strong>%s</strong>?";
#elif L==8
"Czy na pewno chcesz usunac nastepujace u&zdot;ytkownika"
" jako administratora stopnia <strong>%s</strong>?";
#elif L==9
"Do you really want to remove the following user"
" as an administrator of the degree <strong>%s</strong>?"; // Necessita de tradução
#endif
const char *Txt_Do_you_really_want_to_remove_the_following_user_as_an_administrator_of_X = // Warning: it is very important to include %s in the following sentences
#if L==1
"&iquest;Realmente desea eliminar el siguiente usuario"