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

Version19.190.2

This commit is contained in:
acanas 2020-04-19 03:36:59 +02:00
parent 9668e9022d
commit 9a5a0955e9
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_changelog.h
View File

@ -497,7 +497,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 19.190.1 (2020-04-18)"
#define Log_PLATFORM_VERSION "SWAD 19.190.2 (2020-04-18)"
#define CSS_FILE "swad19.190.css"
#define JS_FILE "swad19.172.1.js"
/*
@ -549,7 +549,8 @@ Funci
// TODO: Integrar pull requests con traducciones del alemán del usuario eruedin en GitHub
// TODO: Cambiar icono notificaciones nuevas con "bell-on.svg"
Version 19.190.1: Apr 18, 2020 Fixed bug in degree photo, reported by Adrián José Martínez Navarro. (288491 lines)
Version 19.190.2: Apr 18, 2020 Fixed bugs in degree photo. (288485 lines)
Version 19.190.1: Apr 18, 2020 Fixed bugs in degree photo, reported by Adrián José Martínez Navarro. (288491 lines)
Version 19.190: Apr 18, 2020 Changes in rooms. (288488 lines)
2 changes necessary in database:
ALTER TABLE rooms ADD COLUMN Type ENUM('no_type','administration','auditorium','cafeteria','canteen','classroom','concierge','corridor','gym','hall','kindergarten','laboratory','library','office','outdoors','parking','pavilion','room','secretariat','seminar','shop','store','toilets','virtual','yard') NOT NULL DEFAULT 'no_type' AFTER Floor;

33
swad_photo.c
View File

@ -110,11 +110,9 @@ static long Pho_GetTimeToComputeAvgPhoto (long DegCod);
static void Pho_ComputeAveragePhoto (long DegCod,Usr_Sex_t Sex,Rol_Role_t Role,
Pho_AvgPhotoTypeOfAverage_t TypeOfAverage,const char *DirAvgPhotosRelPath,
unsigned *NumStds,unsigned *NumStdsWithPhoto,long *TimeToComputeAvgPhotoInMicroseconds);
static void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoTypeOfAverage_t TypeOfAverage,
Pho_AvgPhotoSeeOrPrint_t SeeOrPrint);
static void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint);
static void Pho_PutParamsDegPhoto (void *DegPhotos);
static void Pho_PutSelectorForTypeOfAvg (const struct Pho_DegPhotos *DegPhotos,
Pho_AvgPhotoTypeOfAverage_t TypeOfAverage);
static void Pho_PutSelectorForTypeOfAvg (const struct Pho_DegPhotos *DegPhotos);
static Pho_AvgPhotoTypeOfAverage_t Pho_GetPhotoAvgTypeFromForm (void);
static void Pho_PutSelectorForHowComputePhotoSize (const struct Pho_DegPhotos *DegPhotos);
static Pho_HowComputePhotoSize_t Pho_GetHowComputePhotoSizeFromForm (void);
@ -1411,8 +1409,7 @@ void Pho_CalcPhotoDegree (void)
Usr_FreeUsrsList (Rol_STD);
/***** Show photos *****/
Pho_ShowOrPrintPhotoDegree (Pho_GetPhotoAvgTypeFromForm (),
Pho_DEGREES_SEE);
Pho_ShowOrPrintPhotoDegree (Pho_DEGREES_SEE);
}
/*****************************************************************************/
@ -1693,8 +1690,7 @@ static void Pho_ComputeAveragePhoto (long DegCod,Usr_Sex_t Sex,Rol_Role_t Role,
void Pho_ShowPhotoDegree (void)
{
Pho_ShowOrPrintPhotoDegree (Pho_GetPhotoAvgTypeFromForm (),
Pho_DEGREES_SEE);
Pho_ShowOrPrintPhotoDegree (Pho_DEGREES_SEE);
}
/*****************************************************************************/
@ -1703,26 +1699,23 @@ void Pho_ShowPhotoDegree (void)
void Pho_PrintPhotoDegree (void)
{
Pho_ShowOrPrintPhotoDegree (Pho_GetPhotoAvgTypeFromForm (),
Pho_DEGREES_PRINT);
Pho_ShowOrPrintPhotoDegree (Pho_DEGREES_PRINT);
}
/*****************************************************************************/
/*** Show class photo with average photos of all students from each degree ***/
/*****************************************************************************/
static void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoTypeOfAverage_t TypeOfAverage,
Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
static void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
{
extern const char *Hlp_ANALYTICS_Degrees;
extern const char *Txt_Degrees;
struct Pho_DegPhotos DegPhotos;
/***** Get photo size from form *****/
/***** Get parameters from form *****/
DegPhotos.TypeOfAverage = Pho_GetPhotoAvgTypeFromForm ();
DegPhotos.HowComputePhotoSize = Pho_GetHowComputePhotoSizeFromForm ();
/***** Get how to order degrees from form *****/
DegPhotos.HowOrderDegrees = Pho_GetHowOrderDegreesFromForm ();
DegPhotos.HowOrderDegrees = Pho_GetHowOrderDegreesFromForm ();
/***** Get and update type of list,
number of columns in class photo
@ -1739,7 +1732,7 @@ static void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoTypeOfAverage_t TypeOfAverag
HTM_TABLE_BeginCenterPadding (2);
/***** Put a selector for the type of average *****/
Pho_PutSelectorForTypeOfAvg (&DegPhotos,TypeOfAverage);
Pho_PutSelectorForTypeOfAvg (&DegPhotos);
/***** Put a selector for the size of photos *****/
Pho_PutSelectorForHowComputePhotoSize (&DegPhotos);
@ -1801,8 +1794,7 @@ static void Pho_PutParamsDegPhoto (void *DegPhotos)
/******************* Put a selector for the type of average ******************/
/*****************************************************************************/
static void Pho_PutSelectorForTypeOfAvg (const struct Pho_DegPhotos *DegPhotos,
Pho_AvgPhotoTypeOfAverage_t TypeOfAverage)
static void Pho_PutSelectorForTypeOfAvg (const struct Pho_DegPhotos *DegPhotos)
{
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Average_type;
@ -1830,7 +1822,7 @@ static void Pho_PutSelectorForTypeOfAvg (const struct Pho_DegPhotos *DegPhotos,
{
TypeOfAvgUnsigned = (unsigned) TypeOfAvg;
HTM_OPTION (HTM_Type_UNSIGNED,&TypeOfAvgUnsigned,
TypeOfAvg == TypeOfAverage,false,
TypeOfAvg == DegPhotos->TypeOfAverage,false,
"%s",Txt_AVERAGE_PHOTO_TYPES[TypeOfAvg]);
}
HTM_SELECT_End ();
@ -2161,7 +2153,6 @@ static void Pho_ShowOrPrintClassPhotoDegrees (struct Pho_DegPhotos *DegPhotos,
/***** Form to select type of list used to display degree photos *****/
if (SeeOrPrint == Pho_DEGREES_SEE)
Usr_ShowFormsToSelectUsrListType (Pho_PutParamsDegPhoto,DegPhotos);
HTM_TABLE_BeginCenter ();
/***** Get and print degrees *****/