diff --git a/swad_changelog.h b/swad_changelog.h index 9bb57fda9..4204170de 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -217,17 +217,20 @@ // TODO: Change numbers of notifications in program and database to match order in tabs +// TODO: Add plus icons in boxes "Types of group" and "Groups" when editing groups. + /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.194.18 (2017-04-28)" +#define Log_PLATFORM_VERSION "SWAD 16.194.19 (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.19:Apr 28, 2017 Changed dialog to remove a non empty type of group. (218397 lines) Version 16.194.18:Apr 28, 2017 Changed dialog to remove a survey. (218388 lines) Version 16.194.17:Apr 28, 2017 Changed dialog to remove a test question. (218388 lines) Version 16.194.16:Apr 28, 2017 Changed dialog to remove a survey question. (218370 lines) diff --git a/swad_group.c b/swad_group.c index f29b584ee..8f278aba9 100644 --- a/swad_group.c +++ b/swad_group.c @@ -96,6 +96,7 @@ static void Grp_CreateGroupType (void); static void Grp_CreateGroup (void); static void Grp_AskConfirmRemGrpTypWithGrps (unsigned NumGrps); +static void Grp_PutParamRemGrpTyp (void); static void Grp_AskConfirmRemGrp (void); static void Grp_PutParamRemGrp (void); static void Grp_RemoveGroupTypeCompletely (void); @@ -3360,22 +3361,31 @@ static void Grp_AskConfirmRemGrpTypWithGrps (unsigned NumGrps) /***** Get data of the group type from database *****/ Grp_GetDataOfGroupTypeByCod (&Gbl.CurrentCrs.Grps.GrpTyp); - /***** Write message to ask confirmation of removing *****/ + /***** Show question and button to remove type of group *****/ + /* Start alert */ if (NumGrps == 1) sprintf (Gbl.Message,Txt_Do_you_really_want_to_remove_the_type_of_group_X_1_group_, Gbl.CurrentCrs.Grps.GrpTyp.GrpTypName); else sprintf (Gbl.Message,Txt_Do_you_really_want_to_remove_the_type_of_group_X_Y_groups_, Gbl.CurrentCrs.Grps.GrpTyp.GrpTypName,NumGrps); - Lay_ShowAlert (Lay_WARNING,Gbl.Message); + Lay_ShowAlertAndButton1 (Lay_QUESTION,Gbl.Message); - /***** Put button to confirm the removing *****/ - fprintf (Gbl.F.Out,"
"); - Act_FormStart (ActRemGrpTyp); + /* End alert */ + Lay_ShowAlertAndButton2 (ActRemGrpTyp,NULL,Grp_PutParamRemGrpTyp, + Lay_REMOVE_BUTTON,Txt_Remove_type_of_group); + + /***** Show the form again *****/ + Grp_ReqEditGroups (); + } + +/*****************************************************************************/ +/**************** Put parameter to remove a type of group ********************/ +/*****************************************************************************/ + +static void Grp_PutParamRemGrpTyp (void) + { Grp_PutParamGrpTypCod (Gbl.CurrentCrs.Grps.GrpTyp.GrpTypCod); - Lay_PutRemoveButton (Txt_Remove_type_of_group); - Act_FormEnd (); - fprintf (Gbl.F.Out,"
"); } /*****************************************************************************/