From 9668e9022d728e0e994e4a271ac3cbb366cbbcb7 Mon Sep 17 00:00:00 2001 From: acanas Date: Sun, 19 Apr 2020 03:07:16 +0200 Subject: [PATCH] Version19.190.1 --- swad_changelog.h | 4 ++-- swad_photo.c | 25 +++++++++++++++---------- swad_photo.h | 1 - 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 53f55303f..5174654b6 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -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 (2020-04-18)" +#define Log_PLATFORM_VERSION "SWAD 19.190.1 (2020-04-18)" #define CSS_FILE "swad19.190.css" #define JS_FILE "swad19.172.1.js" /* @@ -549,7 +549,7 @@ 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. (? lines) + 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: 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; diff --git a/swad_photo.c b/swad_photo.c index 341abb467..17af2ee70 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -112,6 +112,7 @@ static void Pho_ComputeAveragePhoto (long DegCod,Usr_Sex_t Sex,Rol_Role_t Role, unsigned *NumStds,unsigned *NumStdsWithPhoto,long *TimeToComputeAvgPhotoInMicroseconds); static void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoTypeOfAverage_t TypeOfAverage, Pho_AvgPhotoSeeOrPrint_t SeeOrPrint); +static void Pho_PutParamsDegPhoto (void *DegPhotos); static void Pho_PutSelectorForTypeOfAvg (const struct Pho_DegPhotos *DegPhotos, Pho_AvgPhotoTypeOfAverage_t TypeOfAverage); static Pho_AvgPhotoTypeOfAverage_t Pho_GetPhotoAvgTypeFromForm (void); @@ -125,9 +126,9 @@ static void Pho_PutLinkToPrintViewOfDegreeStatsParams (void *DegPhotos); static void Pho_PutLinkToCalculateDegreeStats (const struct Pho_DegPhotos *DegPhotos); static void Pho_GetMaxStdsPerDegree (struct Pho_DegPhotos *DegPhotos); -static void Pho_ShowOrPrintClassPhotoDegrees (const struct Pho_DegPhotos *DegPhotos, +static void Pho_ShowOrPrintClassPhotoDegrees (struct Pho_DegPhotos *DegPhotos, Pho_AvgPhotoSeeOrPrint_t SeeOrPrint); -static void Pho_ShowOrPrintListDegrees (const struct Pho_DegPhotos *DegPhotos, +static void Pho_ShowOrPrintListDegrees (struct Pho_DegPhotos *DegPhotos, Pho_AvgPhotoSeeOrPrint_t SeeOrPrint); static unsigned long Pho_BuildQueryOfDegrees (Pho_HowOrderDegrees_t HowOrderDegrees, MYSQL_RES **mysql_res); @@ -1786,11 +1787,14 @@ static void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoTypeOfAverage_t TypeOfAverag /**************** Put parameter for degree average photos ********************/ /*****************************************************************************/ -void Pho_PutParamsDegPhoto (void *DegPhotos) +static void Pho_PutParamsDegPhoto (void *DegPhotos) { - Pho_PutHiddenParamTypeOfAvg (((struct Pho_DegPhotos *) DegPhotos)->TypeOfAverage); - Pho_PutHiddenParamPhotoSize (((struct Pho_DegPhotos *) DegPhotos)->HowComputePhotoSize); - Pho_PutHiddenParamOrderDegrees (((struct Pho_DegPhotos *) DegPhotos)->HowOrderDegrees); + if (DegPhotos) + { + Pho_PutHiddenParamTypeOfAvg (((struct Pho_DegPhotos *) DegPhotos)->TypeOfAverage); + Pho_PutHiddenParamPhotoSize (((struct Pho_DegPhotos *) DegPhotos)->HowComputePhotoSize); + Pho_PutHiddenParamOrderDegrees (((struct Pho_DegPhotos *) DegPhotos)->HowOrderDegrees); + } } /*****************************************************************************/ @@ -2136,7 +2140,7 @@ static void Pho_GetMaxStdsPerDegree (struct Pho_DegPhotos *DegPhotos) /************ Show or print the stats of degrees as class photo **************/ /*****************************************************************************/ -static void Pho_ShowOrPrintClassPhotoDegrees (const struct Pho_DegPhotos *DegPhotos, +static void Pho_ShowOrPrintClassPhotoDegrees (struct Pho_DegPhotos *DegPhotos, Pho_AvgPhotoSeeOrPrint_t SeeOrPrint) { MYSQL_RES *mysql_res; @@ -2156,7 +2160,8 @@ static void Pho_ShowOrPrintClassPhotoDegrees (const struct Pho_DegPhotos *DegPho { /***** Form to select type of list used to display degree photos *****/ if (SeeOrPrint == Pho_DEGREES_SEE) - Usr_ShowFormsToSelectUsrListType (Pho_PutParamsDegPhoto,NULL); + Usr_ShowFormsToSelectUsrListType (Pho_PutParamsDegPhoto,DegPhotos); + HTM_TABLE_BeginCenter (); /***** Get and print degrees *****/ @@ -2217,7 +2222,7 @@ static void Pho_ShowOrPrintClassPhotoDegrees (const struct Pho_DegPhotos *DegPho /**************** Show or print the stats of degrees as list *****************/ /*****************************************************************************/ -static void Pho_ShowOrPrintListDegrees (const struct Pho_DegPhotos *DegPhotos, +static void Pho_ShowOrPrintListDegrees (struct Pho_DegPhotos *DegPhotos, Pho_AvgPhotoSeeOrPrint_t SeeOrPrint) { extern const char *Txt_No_INDEX; @@ -2241,7 +2246,7 @@ static void Pho_ShowOrPrintListDegrees (const struct Pho_DegPhotos *DegPhotos, /***** Class photo start *****/ if (SeeOrPrint == Pho_DEGREES_SEE) /***** Form to select type of list used to display degree photos *****/ - Usr_ShowFormsToSelectUsrListType (Pho_PutParamsDegPhoto,NULL); + Usr_ShowFormsToSelectUsrListType (Pho_PutParamsDegPhoto,DegPhotos); /***** Write heading *****/ HTM_TABLE_BeginCenterPadding (2); diff --git a/swad_photo.h b/swad_photo.h index c7e3bff79..d1035befa 100644 --- a/swad_photo.h +++ b/swad_photo.h @@ -130,7 +130,6 @@ void Pho_RemoveObsoleteStatDegrees (void); void Pho_ShowPhotoDegree (void); void Pho_PrintPhotoDegree (void); -void Pho_PutParamsDegPhoto (void *DegPhotos); void Pho_PutHiddenParamTypeOfAvg (Pho_AvgPhotoTypeOfAverage_t TypeOfAverage); void Pho_PutHiddenParamPhotoSize (Pho_HowComputePhotoSize_t HowComputePhotoSize); void Pho_PutHiddenParamOrderDegrees (Pho_HowOrderDegrees_t HowOrderDegrees);