From ab7cd1e513e2a5d75445f19aa15e3b582a8fe25a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 27 Dec 2019 22:00:58 +0100 Subject: [PATCH] Version19.101 --- swad_centre.c | 44 ++++++++++++++++++++++++++++++++------------ swad_changelog.h | 7 ++++--- swad_country.c | 19 ++++++++++--------- swad_course.c | 34 +++++++++++++++++++++++++++------- swad_degree.c | 44 ++++++++++++++++++++++++++++++++------------ swad_hierarchy.c | 22 +++++++++++++--------- swad_hierarchy.h | 4 ++-- swad_institution.c | 41 ++++++++++++++++++++++++++++++----------- 8 files changed, 150 insertions(+), 65 deletions(-) diff --git a/swad_centre.c b/swad_centre.c index e8e6b0b18..eefab223a 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -93,12 +93,12 @@ static void Ctr_ConfigLatitude (void); static void Ctr_ConfigLongitude (void); static void Ctr_ConfigAltitude (void); static void Ctr_ConfigPhoto (bool PrintView,bool PutLink); -static void Ctr_ConfigInstitution (bool PutForm); +static void Ctr_ConfigInstitution (bool PrintView,bool PutForm); static void Ctr_ConfigFullName (bool PutForm); static void Ctr_ConfigShrtName (bool PutForm); static void Ctr_ConfigPlace (bool PutForm); -static void Ctr_ConfigWWW (bool PutForm); -static void Ctr_ConfigShortcut (void); +static void Ctr_ConfigWWW (bool PrintView,bool PutForm); +static void Ctr_ConfigShortcut (bool PrintView); static void Ctr_ConfigQR (void); static void Ctr_ConfigNumUsrs (void); static void Ctr_ConfigNumDegs (void); @@ -352,7 +352,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TABLE_BeginWidePadding (2); /***** Institution *****/ - Ctr_ConfigInstitution (PutFormIns); + Ctr_ConfigInstitution (PrintView,PutFormIns); /***** Centre name *****/ Ctr_ConfigFullName (PutFormName); @@ -370,10 +370,10 @@ static void Ctr_Configuration (bool PrintView) } /***** Centre WWW *****/ - Ctr_ConfigWWW (PutFormWWW); + Ctr_ConfigWWW (PrintView,PutFormWWW); /***** Shortcut to the centre *****/ - Ctr_ConfigShortcut (); + Ctr_ConfigShortcut (PrintView); if (PrintView) /***** QR code with link to the centre *****/ @@ -699,9 +699,10 @@ static void Ctr_ConfigPhoto (bool PrintView,bool PutLink) /***************** Show institution in centre configuration ******************/ /*****************************************************************************/ -static void Ctr_ConfigInstitution (bool PutForm) +static void Ctr_ConfigInstitution (bool PrintView,bool PutForm) { extern const char *Txt_Institution; + extern const char *Txt_Go_to_X; unsigned NumIns; /***** Institution *****/ @@ -713,7 +714,7 @@ static void Ctr_ConfigInstitution (bool PutForm) Txt_Institution); /* Data */ - HTM_TD_Begin ("class=\"DAT_N LM\""); + HTM_TD_Begin ("class=\"DAT LM\""); if (PutForm) { /* Get list of institutions of the current country */ @@ -737,7 +738,26 @@ static void Ctr_ConfigInstitution (bool PutForm) Ins_FreeListInstitutions (); } else // I can not move centre to another institution + { + if (!PrintView) + { + Frm_StartFormGoTo (ActSeeInsInf); + Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod); + snprintf (Gbl.Title,sizeof (Gbl.Title), + Txt_Go_to_X, + Gbl.Hierarchy.Ins.ShrtName); + HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK LT DAT",NULL); + } + Lgo_DrawLogo (Hie_INS,Gbl.Hierarchy.Ins.InsCod,Gbl.Hierarchy.Ins.ShrtName, + 20,"LM",true); + HTM_NBSP (); HTM_Txt (Gbl.Hierarchy.Ins.FullName); + if (!PrintView) + { + HTM_BUTTON_End (); + Frm_EndForm (); + } + } HTM_TD_End (); HTM_TR_End (); @@ -825,18 +845,18 @@ static void Ctr_ConfigPlace (bool PutForm) /***************** Show centre WWW in centre configuration *******************/ /*****************************************************************************/ -static void Ctr_ConfigWWW (bool PutForm) +static void Ctr_ConfigWWW (bool PrintView,bool PutForm) { - Hie_ConfigWWW (PutForm,ActChgCtrWWWCfg,Gbl.Hierarchy.Ctr.WWW); + Hie_ConfigWWW (PrintView,PutForm,ActChgCtrWWWCfg,Gbl.Hierarchy.Ctr.WWW); } /*****************************************************************************/ /*************** Show centre shortcut in centre configuration ****************/ /*****************************************************************************/ -static void Ctr_ConfigShortcut (void) +static void Ctr_ConfigShortcut (bool PrintView) { - Hie_ConfigShortcut ("ctr",Gbl.Hierarchy.Ctr.CtrCod); + Hie_ConfigShortcut (PrintView,"ctr",Gbl.Hierarchy.Ctr.CtrCod); } /*****************************************************************************/ diff --git a/swad_changelog.h b/swad_changelog.h index c716ad48a..a054cacb1 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -492,7 +492,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.100 (2019-12-27)" +#define Log_PLATFORM_VERSION "SWAD 19.101 (2019-12-27)" #define CSS_FILE "swad19.99.1.css" #define JS_FILE "swad19.91.1.js" /* @@ -500,8 +500,9 @@ ps2pdf source.ps destination.pdf // TODO: Impedir la creación y edición de proyectos si no son editables. // TODO: No se puede entrar con DNI '1' suponiendo que no tenga password ¿por qué? - Version 19.102: Dec 27, 2019 Map in country information. (? lines) - Version 19.101: Dec 27, 2019 Map in institution information. (? lines) + Version 19.103: Dec 27, 2019 Map in country information. (? lines) + Version 19.102: Dec 27, 2019 Map in institution information. (? lines) + Version 19.101: Dec 27, 2019 Code refactoring in course, degree, centre, institution and country information. (249255 lines) Version 19.100: Dec 27, 2019 Code refactoring in country information. (249170 lines) Version 19.99.2: Dec 27, 2019 Fixed bug in attendance. (248857 lines) Version 19.99.1: Dec 27, 2019 Code refactoring in form labels. (248855 lines) diff --git a/swad_country.c b/swad_country.c index dead8cf4d..0d9900c51 100644 --- a/swad_country.c +++ b/swad_country.c @@ -75,7 +75,7 @@ static void Cty_PutIconToPrint (void); static void Cty_ConfigTitle (bool PutLink); static void Cty_ConfigMap (bool PrintView,bool PutLink); static void Cty_ConfigName (bool PutLink); -static void Cty_ConfigShortcut (void); +static void Cty_ConfigShortcut (bool PrintView); static void Cty_ConfigQR (void); static void Cty_ConfigNumUsrs (void); static void Cty_ConfigNumInss (void); @@ -277,7 +277,7 @@ static void Cty_Configuration (bool PrintView) Cty_ConfigName (PutLink); /***** Shortcut to the country *****/ - Cty_ConfigShortcut (); + Cty_ConfigShortcut (PrintView); if (PrintView) /***** QR code with link to the country *****/ @@ -414,9 +414,9 @@ static void Cty_ConfigName (bool PutLink) /************** Show country shortcut in country configuration ***************/ /*****************************************************************************/ -static void Cty_ConfigShortcut (void) +static void Cty_ConfigShortcut (bool PrintView) { - Hie_ConfigShortcut ("cty",Gbl.Hierarchy.Cty.CtyCod); + Hie_ConfigShortcut (PrintView,"cty",Gbl.Hierarchy.Cty.CtyCod); } /*****************************************************************************/ @@ -553,17 +553,18 @@ static void Cty_ConfigNumCrss (void) static void Cty_ShowNumUsrsInCrssOfCty (Rol_Role_t Role) { - extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_Users_in_courses; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; + /***** Number of users in courses *****/ HTM_TR_Begin (NULL); - HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtF ("%s:",Role == Rol_UNK ? Txt_Users_in_courses : - Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); - HTM_TD_End (); + /* Label */ + Frm_LabelColumn ("RM",NULL, + Role == Rol_UNK ? Txt_Users_in_courses : + Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); + /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); HTM_Unsigned (Usr_GetNumUsrsInCrssOfCty (Role,Gbl.Hierarchy.Cty.CtyCod)); HTM_TD_End (); diff --git a/swad_course.c b/swad_course.c index b26b45352..3b9451580 100644 --- a/swad_course.c +++ b/swad_course.c @@ -81,13 +81,13 @@ static struct Course *Crs_EditingCrs = NULL; // Static variable to keep the cour static void Crs_Configuration (bool PrintView); static void Crs_PutIconToPrint (void); static void Crs_ConfigTitle (bool PutLink); -static void Crs_ConfigDegree (bool PutForm); +static void Crs_ConfigDegree (bool PrintView,bool PutForm); static void Crs_ConfigFullName (bool PutForm); static void Crs_ConfigShrtName (bool PutForm); static void Crs_ConfigYear (bool PutForm); static void Crs_ConfigInstitutionalCode (bool PutForm); static void Crs_ConfigInternalCode (void); -static void Crs_ConfigShortcut (void); +static void Crs_ConfigShortcut (bool PrintView); static void Crs_ConfigQR (void); static void Crs_ShowNumUsrsInCrs (Rol_Role_t Role); static void Crs_ConfigIndicators (void); @@ -223,7 +223,7 @@ static void Crs_Configuration (bool PrintView) HTM_TABLE_BeginWidePadding (2); /***** Degree *****/ - Crs_ConfigDegree (PutFormDeg); + Crs_ConfigDegree (PrintView,PutFormDeg); /***** Course name *****/ Crs_ConfigFullName (PutFormName); @@ -242,7 +242,7 @@ static void Crs_Configuration (bool PrintView) } /***** Shortcut to the couse *****/ - Crs_ConfigShortcut (); + Crs_ConfigShortcut (PrintView); if (PrintView) /***** QR code with link to the course *****/ @@ -293,9 +293,10 @@ static void Crs_ConfigTitle (bool PutLink) /******************** Show degree in course configuration ********************/ /*****************************************************************************/ -static void Crs_ConfigDegree (bool PutForm) +static void Crs_ConfigDegree (bool PrintView,bool PutForm) { extern const char *Txt_Degree; + extern const char *Txt_Go_to_X; unsigned NumDeg; /***** Degree *****/ @@ -331,7 +332,26 @@ static void Crs_ConfigDegree (bool PutForm) Deg_FreeListDegs (&Gbl.Hierarchy.Ctr.Degs); } else // I can not move course to another degree + { + if (!PrintView) + { + Frm_StartFormGoTo (ActSeeDegInf); + Deg_PutParamDegCod (Gbl.Hierarchy.Deg.DegCod); + snprintf (Gbl.Title,sizeof (Gbl.Title), + Txt_Go_to_X, + Gbl.Hierarchy.Deg.ShrtName); + HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK LT DAT",NULL); + } + Lgo_DrawLogo (Hie_DEG,Gbl.Hierarchy.Deg.DegCod,Gbl.Hierarchy.Deg.ShrtName, + 20,"LM",true); + HTM_NBSP (); HTM_Txt (Gbl.Hierarchy.Deg.FullName); + if (!PrintView) + { + HTM_BUTTON_End (); + Frm_EndForm (); + } + } HTM_TD_End (); HTM_TR_End (); @@ -461,9 +481,9 @@ static void Crs_ConfigInternalCode (void) /*************** Show course shortcut in course configuration ****************/ /*****************************************************************************/ -static void Crs_ConfigShortcut (void) +static void Crs_ConfigShortcut (bool PrintView) { - Hie_ConfigShortcut ("crs",Gbl.Hierarchy.Crs.CrsCod); + Hie_ConfigShortcut (PrintView,"crs",Gbl.Hierarchy.Crs.CrsCod); } /*****************************************************************************/ diff --git a/swad_degree.c b/swad_degree.c index 3b0200934..6757f574c 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -89,11 +89,11 @@ static struct Degree *Deg_EditingDeg = NULL; // Static variable to keep the degr static void Deg_Configuration (bool PrintView); static void Deg_PutIconsToPrintAndUpload (void); static void Deg_ConfigTitle (bool PutLink); -static void Deg_ConfigCentre (bool PutForm); +static void Deg_ConfigCentre (bool PrintView,bool PutForm); static void Deg_ConfigFullName (bool PutForm); static void Deg_ConfigShrtName (bool PutForm); -static void Deg_ConfigWWW (bool PutForm); -static void Deg_ConfigShortcut (void); +static void Deg_ConfigWWW (bool PrintView,bool PutForm); +static void Deg_ConfigShortcut (bool PrintView); static void Deg_ConfigQR (void); static void Deg_ConfigNumCrss (void); static void Deg_ShowNumUsrsInCrssOfDeg (Rol_Role_t Role); @@ -331,17 +331,17 @@ static void Deg_Configuration (bool PrintView) HTM_TABLE_BeginWidePadding (2); /***** Centre *****/ - Deg_ConfigCentre (PutFormCtr); + Deg_ConfigCentre (PrintView,PutFormCtr); /***** Degree name *****/ Deg_ConfigFullName (PutFormName); Deg_ConfigShrtName (PutFormName); /***** Degree WWW *****/ - Deg_ConfigWWW (PutFormWWW); + Deg_ConfigWWW (PrintView,PutFormWWW); /***** Shortcut to the degree *****/ - Deg_ConfigShortcut (); + Deg_ConfigShortcut (PrintView); if (PrintView) /***** QR code with link to the degree *****/ @@ -400,9 +400,10 @@ static void Deg_ConfigTitle (bool PutLink) /******************** Show centre in degree configuration ********************/ /*****************************************************************************/ -static void Deg_ConfigCentre (bool PutForm) +static void Deg_ConfigCentre (bool PrintView,bool PutForm) { extern const char *Txt_Centre; + extern const char *Txt_Go_to_X; unsigned NumCtr; /***** Centre *****/ @@ -414,7 +415,7 @@ static void Deg_ConfigCentre (bool PutForm) Txt_Centre); /* Data */ - HTM_TD_Begin ("class=\"DAT_N LM\""); + HTM_TD_Begin ("class=\"DAT LM\""); if (PutForm) { /* Get list of centres of the current institution */ @@ -438,7 +439,26 @@ static void Deg_ConfigCentre (bool PutForm) Ctr_FreeListCentres (); } else // I can not move degree to another centre + { + if (!PrintView) + { + Frm_StartFormGoTo (ActSeeCtrInf); + Ctr_PutParamCtrCod (Gbl.Hierarchy.Ctr.CtrCod); + snprintf (Gbl.Title,sizeof (Gbl.Title), + Txt_Go_to_X, + Gbl.Hierarchy.Ctr.ShrtName); + HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK LT DAT",NULL); + } + Lgo_DrawLogo (Hie_CTR,Gbl.Hierarchy.Ctr.CtrCod,Gbl.Hierarchy.Ctr.ShrtName, + 20,"LM",true); + HTM_NBSP (); HTM_Txt (Gbl.Hierarchy.Ctr.FullName); + if (!PrintView) + { + HTM_BUTTON_End (); + Frm_EndForm (); + } + } HTM_TD_End (); HTM_TR_End (); @@ -469,18 +489,18 @@ static void Deg_ConfigShrtName (bool PutForm) /***************** Show degree WWW in degree configuration *******************/ /*****************************************************************************/ -static void Deg_ConfigWWW (bool PutForm) +static void Deg_ConfigWWW (bool PrintView,bool PutForm) { - Hie_ConfigWWW (PutForm,ActChgDegWWWCfg,Gbl.Hierarchy.Deg.WWW); + Hie_ConfigWWW (PrintView,PutForm,ActChgDegWWWCfg,Gbl.Hierarchy.Deg.WWW); } /*****************************************************************************/ /*************** Show degree shortcut in degree configuration ****************/ /*****************************************************************************/ -static void Deg_ConfigShortcut (void) +static void Deg_ConfigShortcut (bool PrintView) { - Hie_ConfigShortcut ("deg",Gbl.Hierarchy.Deg.DegCod); + Hie_ConfigShortcut (PrintView,"deg",Gbl.Hierarchy.Deg.DegCod); } /*****************************************************************************/ diff --git a/swad_hierarchy.c b/swad_hierarchy.c index 0691a4c65..9ab179e68 100644 --- a/swad_hierarchy.c +++ b/swad_hierarchy.c @@ -156,7 +156,7 @@ void Hie_ConfigShrtName (bool PutForm,Act_Action_t NextAction, /************************* Show web in configuration *************************/ /*****************************************************************************/ -void Hie_ConfigWWW (bool PutForm,Act_Action_t NextAction, +void Hie_ConfigWWW (bool PrintView,bool PutForm,Act_Action_t NextAction, const char WWW[Cns_MAX_BYTES_WWW + 1]) { extern const char *Txt_Web; @@ -182,9 +182,11 @@ void Hie_ConfigWWW (bool PutForm,Act_Action_t NextAction, else // I can not change web { HTM_DIV_Begin ("class=\"EXTERNAL_WWW_LONG\""); - HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT\"",WWW); + if (!PrintView) + HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT\"",WWW); HTM_Txt (WWW); - HTM_A_End (); + if (!PrintView) + HTM_A_End (); HTM_DIV_End (); } HTM_TD_End (); @@ -196,7 +198,7 @@ void Hie_ConfigWWW (bool PutForm,Act_Action_t NextAction, /********************** Show shortcut in configuration ***********************/ /*****************************************************************************/ -void Hie_ConfigShortcut (const char *ParamName,long HieCod) +void Hie_ConfigShortcut (bool PrintView,const char *ParamName,long HieCod) { extern const char *Lan_STR_LANG_ID[1 + Lan_NUM_LANGUAGES]; extern const char *Txt_Shortcut; @@ -209,15 +211,17 @@ void Hie_ConfigShortcut (const char *ParamName,long HieCod) /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); - HTM_A_Begin ("href=\"%s/%s?%s=%ld\" class=\"DAT\" target=\"_blank\"", - Cfg_URL_SWAD_CGI, - Lan_STR_LANG_ID[Gbl.Prefs.Language], - ParamName,HieCod); + if (!PrintView) + HTM_A_Begin ("href=\"%s/%s?%s=%ld\" class=\"DAT\" target=\"_blank\"", + Cfg_URL_SWAD_CGI, + Lan_STR_LANG_ID[Gbl.Prefs.Language], + ParamName,HieCod); HTM_TxtF ("%s/%s?%s=%ld", Cfg_URL_SWAD_CGI, Lan_STR_LANG_ID[Gbl.Prefs.Language], ParamName,HieCod); - HTM_A_End (); + if (!PrintView) + HTM_A_End (); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_hierarchy.h b/swad_hierarchy.h index 5e2d30b96..f7ef13b04 100644 --- a/swad_hierarchy.h +++ b/swad_hierarchy.h @@ -71,9 +71,9 @@ void Hie_ConfigFullName (bool PutForm,const char *Label,Act_Action_t NextAction, const char FullName[Hie_MAX_BYTES_FULL_NAME + 1]); void Hie_ConfigShrtName (bool PutForm,Act_Action_t NextAction, const char ShrtName[Hie_MAX_BYTES_SHRT_NAME + 1]); -void Hie_ConfigWWW (bool PutForm,Act_Action_t NextAction, +void Hie_ConfigWWW (bool PrintView,bool PutForm,Act_Action_t NextAction, const char WWW[Cns_MAX_BYTES_WWW + 1]); -void Hie_ConfigShortcut (const char *ParamName,long HieCod); +void Hie_ConfigShortcut (bool PrintView,const char *ParamName,long HieCod); void Hie_ConfigQR (const char *ParamName,long HieCod); void Hie_SeePending (void); diff --git a/swad_institution.c b/swad_institution.c index d71bb2dc7..9c5ffb0fb 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -73,11 +73,11 @@ static void Ins_PutIconsToPrintAndUpload (void); static void Ins_ConfigTitle (bool PutLink); static bool Ins_GetIfMapIsAvailable (void); static void Ins_ConfigMap (void); -static void Ins_ConfigCountry (bool PutForm); +static void Ins_ConfigCountry (bool PrintView,bool PutForm); static void Ins_ConfigFullName (bool PutForm); static void Ins_ConfigShrtName (bool PutForm); -static void Ins_ConfigWWW (bool PutForm); -static void Ins_ConfigShortcut (void); +static void Ins_ConfigWWW (bool PrintView,bool PutForm); +static void Ins_ConfigShortcut (bool PrintView); static void Ins_ConfigQR (void); static void Ins_ConfigNumUsrs (void); static void Ins_ConfigNumCtrs (void); @@ -352,17 +352,17 @@ static void Ins_Configuration (bool PrintView) HTM_TABLE_BeginWidePadding (2); /***** Country *****/ - Ins_ConfigCountry (PutFormCty); + Ins_ConfigCountry (PrintView,PutFormCty); /***** Institution name *****/ Ins_ConfigFullName (PutFormName); Ins_ConfigShrtName (PutFormName); /***** Institution WWW *****/ - Ins_ConfigWWW (PutFormWWW); + Ins_ConfigWWW (PrintView,PutFormWWW); /***** Shortcut to the institution *****/ - Ins_ConfigShortcut (); + Ins_ConfigShortcut (PrintView); if (PrintView) /***** QR code with link to the institution *****/ @@ -507,9 +507,10 @@ static void Ins_ConfigMap (void) /***************** Show country in institution configuration *****************/ /*****************************************************************************/ -static void Ins_ConfigCountry (bool PutForm) +static void Ins_ConfigCountry (bool PrintView,bool PutForm) { extern const char *Txt_Country; + extern const char *Txt_Go_to_X; unsigned NumCty; /***** Country *****/ @@ -545,7 +546,25 @@ static void Ins_ConfigCountry (bool PutForm) Cty_FreeListCountries (); } else // I can not move institution to another country + { + if (!PrintView) + { + Frm_StartFormGoTo (ActSeeCtyInf); + Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod); + snprintf (Gbl.Title,sizeof (Gbl.Title), + Txt_Go_to_X, + Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); + HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK LT DAT",NULL); + } + Cty_DrawCountryMap (&Gbl.Hierarchy.Cty,"COUNTRY_MAP_TINY"); + HTM_NBSP (); HTM_Txt (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); + if (!PrintView) + { + HTM_BUTTON_End (); + Frm_EndForm (); + } + } HTM_TD_End (); HTM_TR_End (); @@ -576,18 +595,18 @@ static void Ins_ConfigShrtName (bool PutForm) /************ Show institution WWW in institution configuration **************/ /*****************************************************************************/ -static void Ins_ConfigWWW (bool PutForm) +static void Ins_ConfigWWW (bool PrintView,bool PutForm) { - Hie_ConfigWWW (PutForm,ActChgInsWWWCfg,Gbl.Hierarchy.Ins.WWW); + Hie_ConfigWWW (PrintView,PutForm,ActChgInsWWWCfg,Gbl.Hierarchy.Ins.WWW); } /*****************************************************************************/ /********** Show institution shortcut in institution configuration ***********/ /*****************************************************************************/ -static void Ins_ConfigShortcut (void) +static void Ins_ConfigShortcut (bool PrintView) { - Hie_ConfigShortcut ("ins",Gbl.Hierarchy.Ins.InsCod); + Hie_ConfigShortcut (PrintView,"ins",Gbl.Hierarchy.Ins.InsCod); } /*****************************************************************************/