Version 16.167.16

This commit is contained in:
Antonio Cañas Vargas 2017-03-26 14:57:47 +02:00
parent 80d9c44a00
commit 213f51d576
4 changed files with 42 additions and 10 deletions

View File

@ -806,6 +806,9 @@ static void Ctr_PutIconsListCentres (void)
if (Ctr_CheckIfICanCreateCentres ()) if (Ctr_CheckIfICanCreateCentres ())
Ctr_PutIconToEditCentres (); Ctr_PutIconToEditCentres ();
/***** Put icon to view places *****/
Plc_PutIconToViewPlaces ();
/***** Put icon to show a figure *****/ /***** Put icon to show a figure *****/
Gbl.Stat.FigureType = Sta_HIERARCHY; Gbl.Stat.FigureType = Sta_HIERARCHY;
Sta_PutIconToShowFigure (); Sta_PutIconToShowFigure ();
@ -1390,7 +1393,8 @@ static void Ctr_ListCentresForEdition (void)
/***** Write heading *****/ /***** Write heading *****/
sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X, sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X,
Gbl.CurrentIns.Ins.FullName); Gbl.CurrentIns.Ins.FullName);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL,Hlp_INSTITUTION_Centres,2); Lay_StartRoundFrameTable (NULL,Gbl.Title,Plc_PutIconToViewPlaces,
Hlp_INSTITUTION_Centres,2);
Ctr_PutHeadCentresForEdition (); Ctr_PutHeadCentresForEdition ();
/***** Write all the centres *****/ /***** Write all the centres *****/
@ -2406,6 +2410,12 @@ static void Ctr_PutFormToCreateCentre (void)
Ctr = &Gbl.Ctrs.EditingCtr; Ctr = &Gbl.Ctrs.EditingCtr;
/***** Start frame *****/
sprintf (Gbl.Title,Txt_New_centre_of_INSTITUTION_X,
Gbl.CurrentIns.Ins.ShrtName);
Lay_StartRoundFrame (NULL,Gbl.Title,Plc_PutIconToViewPlaces,
Hlp_INSTITUTION_Centres);
/***** Start form *****/ /***** Start form *****/
if (Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM) if (Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM)
Act_FormStart (ActNewCtr); Act_FormStart (ActNewCtr);
@ -2414,12 +2424,10 @@ static void Ctr_PutFormToCreateCentre (void)
else else
Lay_ShowErrorAndExit ("You can not edit centres."); Lay_ShowErrorAndExit ("You can not edit centres.");
/***** Start of frame *****/ /***** Start table *****/
sprintf (Gbl.Title,Txt_New_centre_of_INSTITUTION_X, fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_MARGIN CELLS_PAD_2\">");
Gbl.CurrentIns.Ins.ShrtName);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL,Hlp_INSTITUTION_Centres,2);
/***** Write heading *****/ /***** Table head *****/
Ctr_PutHeadCentresForEdition (); Ctr_PutHeadCentresForEdition ();
/***** Put disabled icon to remove centre *****/ /***** Put disabled icon to remove centre *****/
@ -2510,11 +2518,17 @@ static void Ctr_PutFormToCreateCentre (void)
"</td>" "</td>"
"</tr>"); "</tr>");
/***** Send button and end frame *****/ /***** End table *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_centre); fprintf (Gbl.F.Out,"</table>");
/***** End of form *****/ /***** Button to send form *****/
Lay_PutCreateButton (Txt_Create_centre);
/***** End form *****/
Act_FormEnd (); Act_FormEnd ();
/***** End frame *****/
Lay_EndRoundFrame ();
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -205,17 +205,20 @@
// TODO: Comprobar cabecera de una orla cuando el ámbito actual es un centro // TODO: Comprobar cabecera de una orla cuando el ámbito actual es un centro
// TODO: Include type of degree in form of degree configuration // TODO: Include type of degree in form of degree configuration
// TODO: Cuando un admin. pulsa en "Inscribir profesor/a" y el usuario es invitado, debería salir en el rol por defecto "profesor" y no "estudiante"
/*****************************************************************************/ /*****************************************************************************/
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.167.15 (2017-03-26)" #define Log_PLATFORM_VERSION "SWAD 16.167.16 (2017-03-26)"
#define CSS_FILE "swad16.166.css" #define CSS_FILE "swad16.166.css"
#define JS_FILE "swad16.144.js" #define JS_FILE "swad16.144.js"
// 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 sql/swad*.sql | tail -1 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/* /*
Version 16.167.16:Mar 26, 2017 Link to view places in centres. (217718 lines)
Version 16.167.15:Mar 26, 2017 Code refactoring in enrollment. (217694 lines) Version 16.167.15:Mar 26, 2017 Code refactoring in enrollment. (217694 lines)
Version 16.167.14:Mar 26, 2017 Code refactoring in follow/unfollow. (217691 lines) Version 16.167.14:Mar 26, 2017 Code refactoring in follow/unfollow. (217691 lines)
Version 16.167.13:Mar 26, 2017 Code refactoring in uploading of photos. (217686 lines) Version 16.167.13:Mar 26, 2017 Code refactoring in uploading of photos. (217686 lines)

View File

@ -71,6 +71,20 @@ static void Plc_PutFormToCreatePlace (void);
static void Plc_PutHeadPlaces (void); static void Plc_PutHeadPlaces (void);
static void Plc_CreatePlace (struct Place *Plc); static void Plc_CreatePlace (struct Place *Plc);
/*****************************************************************************/
/********************** Put link (form) to view places ***********************/
/*****************************************************************************/
void Plc_PutIconToViewPlaces (void)
{
extern const char *Txt_Places;
Lay_PutContextualLink (ActSeePlc,NULL,
"mapmarker64x64.png",
Txt_Places,NULL,
NULL);
}
/*****************************************************************************/ /*****************************************************************************/
/*************************** List all the places *****************************/ /*************************** List all the places *****************************/
/*****************************************************************************/ /*****************************************************************************/

View File

@ -58,6 +58,7 @@ typedef enum
/***************************** Public prototypes *****************************/ /***************************** Public prototypes *****************************/
/*****************************************************************************/ /*****************************************************************************/
void Plc_PutIconToViewPlaces (void);
void Plc_SeePlaces (void); void Plc_SeePlaces (void);
void Plc_EditPlaces (void); void Plc_EditPlaces (void);
void Plc_GetListPlaces (void); void Plc_GetListPlaces (void);