mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-18 06:25:42 +02:00
Version19.54.5
This commit is contained in:
parent
8620baa373
commit
e0e6b8295c
|
@ -1458,7 +1458,7 @@ static void Ctr_ListCentresForEdition (void)
|
||||||
struct UsrData UsrDat;
|
struct UsrData UsrDat;
|
||||||
bool ICanEdit;
|
bool ICanEdit;
|
||||||
Ctr_StatusTxt_t StatusTxt;
|
Ctr_StatusTxt_t StatusTxt;
|
||||||
unsigned Status;
|
unsigned StatusUnsigned;
|
||||||
|
|
||||||
/***** Initialize structure with user's data *****/
|
/***** Initialize structure with user's data *****/
|
||||||
Usr_UsrDataConstructor (&UsrDat);
|
Usr_UsrDataConstructor (&UsrDat);
|
||||||
|
@ -1615,14 +1615,12 @@ static void Ctr_ListCentresForEdition (void)
|
||||||
HTM_SELECT_Begin (true,
|
HTM_SELECT_Begin (true,
|
||||||
"name=\"Status\" class=\"INPUT_STATUS\"");
|
"name=\"Status\" class=\"INPUT_STATUS\"");
|
||||||
|
|
||||||
Status = (unsigned) Ctr_GetStatusBitsFromStatusTxt (Ctr_STATUS_PENDING);
|
StatusUnsigned = (unsigned) Ctr_GetStatusBitsFromStatusTxt (Ctr_STATUS_PENDING);
|
||||||
HTM_OPTION (HTM_Type_UNSIGNED,(void *) &Status,
|
HTM_OPTION (HTM_Type_UNSIGNED,(void *) &StatusUnsigned,true,false,
|
||||||
true,false,
|
|
||||||
"%s",Txt_CENTRE_STATUS[Ctr_STATUS_PENDING]);
|
"%s",Txt_CENTRE_STATUS[Ctr_STATUS_PENDING]);
|
||||||
|
|
||||||
Status = (unsigned) Ctr_GetStatusBitsFromStatusTxt (Ctr_STATUS_ACTIVE);
|
StatusUnsigned = (unsigned) Ctr_GetStatusBitsFromStatusTxt (Ctr_STATUS_ACTIVE);
|
||||||
HTM_OPTION (HTM_Type_UNSIGNED,(void *) &Status,
|
HTM_OPTION (HTM_Type_UNSIGNED,(void *) &StatusUnsigned,false,false,
|
||||||
false,false,
|
|
||||||
"%s",Txt_CENTRE_STATUS[Ctr_STATUS_ACTIVE]);
|
"%s",Txt_CENTRE_STATUS[Ctr_STATUS_ACTIVE]);
|
||||||
|
|
||||||
HTM_SELECT_End ();
|
HTM_SELECT_End ();
|
||||||
|
|
|
@ -490,7 +490,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
|
||||||
En OpenSWAD:
|
En OpenSWAD:
|
||||||
ps2pdf source.ps destination.pdf
|
ps2pdf source.ps destination.pdf
|
||||||
*/
|
*/
|
||||||
#define Log_PLATFORM_VERSION "SWAD 19.54.4 (2019-11-06)"
|
#define Log_PLATFORM_VERSION "SWAD 19.54.5 (2019-11-06)"
|
||||||
#define CSS_FILE "swad19.47.css"
|
#define CSS_FILE "swad19.47.css"
|
||||||
#define JS_FILE "swad19.39.js"
|
#define JS_FILE "swad19.39.js"
|
||||||
/*
|
/*
|
||||||
|
@ -498,6 +498,7 @@ ps2pdf source.ps destination.pdf
|
||||||
// TODO: Impedir la creación y edición de proyectos si no son editables.
|
// TODO: Impedir la creación y edición de proyectos si no son editables.
|
||||||
// TODO: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia)
|
// TODO: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia)
|
||||||
|
|
||||||
|
Version 19.54.5: Nov 05, 2019 Code refactoring in HTML select options. (245985 lines)
|
||||||
Version 19.54.4: Nov 05, 2019 Code refactoring in HTML select options. (246023 lines)
|
Version 19.54.4: Nov 05, 2019 Code refactoring in HTML select options. (246023 lines)
|
||||||
Version 19.54.3: Nov 05, 2019 Code refactoring in HTML select options. (246050 lines)
|
Version 19.54.3: Nov 05, 2019 Code refactoring in HTML select options. (246050 lines)
|
||||||
Version 19.54.2: Nov 06, 2019 Fixed bug in dates form. (246055 lines)
|
Version 19.54.2: Nov 06, 2019 Fixed bug in dates form. (246055 lines)
|
||||||
|
|
|
@ -1407,7 +1407,7 @@ static void Crs_ListCoursesOfAYearForEdition (unsigned Year)
|
||||||
struct UsrData UsrDat;
|
struct UsrData UsrDat;
|
||||||
bool ICanEdit;
|
bool ICanEdit;
|
||||||
Crs_StatusTxt_t StatusTxt;
|
Crs_StatusTxt_t StatusTxt;
|
||||||
unsigned Status;
|
unsigned StatusUnsigned;
|
||||||
|
|
||||||
/***** Initialize structure with user's data *****/
|
/***** Initialize structure with user's data *****/
|
||||||
Usr_UsrDataConstructor (&UsrDat);
|
Usr_UsrDataConstructor (&UsrDat);
|
||||||
|
@ -1536,12 +1536,12 @@ static void Crs_ListCoursesOfAYearForEdition (unsigned Year)
|
||||||
HTM_SELECT_Begin (true,
|
HTM_SELECT_Begin (true,
|
||||||
"name=\"Status\" class=\"INPUT_STATUS\"");
|
"name=\"Status\" class=\"INPUT_STATUS\"");
|
||||||
|
|
||||||
Status = (unsigned) Crs_GetStatusBitsFromStatusTxt (Crs_STATUS_PENDING);
|
StatusUnsigned = (unsigned) Crs_GetStatusBitsFromStatusTxt (Crs_STATUS_PENDING);
|
||||||
HTM_OPTION (HTM_Type_UNSIGNED,(void *) &Status,true,false,
|
HTM_OPTION (HTM_Type_UNSIGNED,(void *) &StatusUnsigned,true,false,
|
||||||
"%s",Txt_COURSE_STATUS[Crs_STATUS_PENDING]);
|
"%s",Txt_COURSE_STATUS[Crs_STATUS_PENDING]);
|
||||||
|
|
||||||
Status = (unsigned) Crs_GetStatusBitsFromStatusTxt (Crs_STATUS_ACTIVE);
|
StatusUnsigned = (unsigned) Crs_GetStatusBitsFromStatusTxt (Crs_STATUS_ACTIVE);
|
||||||
HTM_OPTION (HTM_Type_UNSIGNED,(void *) &Status,false,false,
|
HTM_OPTION (HTM_Type_UNSIGNED,(void *) &StatusUnsigned,false,false,
|
||||||
"%s",Txt_COURSE_STATUS[Crs_STATUS_ACTIVE]);
|
"%s",Txt_COURSE_STATUS[Crs_STATUS_ACTIVE]);
|
||||||
|
|
||||||
HTM_SELECT_End ();
|
HTM_SELECT_End ();
|
||||||
|
|
|
@ -3253,6 +3253,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
|
||||||
extern const char *Txt_Save_changes;
|
extern const char *Txt_Save_changes;
|
||||||
extern const char *Txt_Members;
|
extern const char *Txt_Members;
|
||||||
Prj_Proposal_t Proposal;
|
Prj_Proposal_t Proposal;
|
||||||
|
unsigned ProposalUnsigned;
|
||||||
unsigned NumRoleToShow;
|
unsigned NumRoleToShow;
|
||||||
|
|
||||||
/***** Start project box *****/
|
/***** Start project box *****/
|
||||||
|
@ -3379,11 +3380,10 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
|
||||||
Proposal <= (Prj_Proposal_t) (Prj_NUM_PROPOSAL_TYPES - 1);
|
Proposal <= (Prj_Proposal_t) (Prj_NUM_PROPOSAL_TYPES - 1);
|
||||||
Proposal++)
|
Proposal++)
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out,"<option value=\"%u\"",
|
ProposalUnsigned = (unsigned) Proposal;
|
||||||
(unsigned) Proposal);
|
HTM_OPTION (HTM_Type_UNSIGNED,(void *) &ProposalUnsigned,
|
||||||
if (Prj->Proposal == Proposal)
|
Prj->Proposal == Proposal,false,
|
||||||
fprintf (Gbl.F.Out," selected=\"selected\"");
|
"%s",Txt_PROJECT_STATUS[Proposal]);
|
||||||
fprintf (Gbl.F.Out,">%s</option>",Txt_PROJECT_STATUS[Proposal]);
|
|
||||||
}
|
}
|
||||||
HTM_SELECT_End ();
|
HTM_SELECT_End ();
|
||||||
HTM_TD_End ();
|
HTM_TD_End ();
|
||||||
|
|
171
swad_record.c
171
swad_record.c
|
@ -286,6 +286,7 @@ void Rec_ListFieldsRecordsForEdition (void)
|
||||||
extern const char *Txt_RECORD_FIELD_VISIBILITY_MENU[Rec_NUM_TYPES_VISIBILITY];
|
extern const char *Txt_RECORD_FIELD_VISIBILITY_MENU[Rec_NUM_TYPES_VISIBILITY];
|
||||||
unsigned NumField;
|
unsigned NumField;
|
||||||
Rec_VisibilityRecordFields_t Vis;
|
Rec_VisibilityRecordFields_t Vis;
|
||||||
|
unsigned VisUnsigned;
|
||||||
char StrNumLines[10 + 1];
|
char StrNumLines[10 + 1];
|
||||||
|
|
||||||
/***** Write heading *****/
|
/***** Write heading *****/
|
||||||
|
@ -338,11 +339,10 @@ void Rec_ListFieldsRecordsForEdition (void)
|
||||||
Vis < (Rec_VisibilityRecordFields_t) Rec_NUM_TYPES_VISIBILITY;
|
Vis < (Rec_VisibilityRecordFields_t) Rec_NUM_TYPES_VISIBILITY;
|
||||||
Vis++)
|
Vis++)
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out,"<option value=\"%u\"",(unsigned) Vis);
|
VisUnsigned = (unsigned) Vis;
|
||||||
if (Gbl.Crs.Records.LstFields.Lst[NumField].Visibility == Vis)
|
HTM_OPTION (HTM_Type_UNSIGNED,(void *) &VisUnsigned,
|
||||||
fprintf (Gbl.F.Out," selected=\"selected\"");
|
Gbl.Crs.Records.LstFields.Lst[NumField].Visibility == Vis,false,
|
||||||
fprintf (Gbl.F.Out,">%s</option>",
|
"%s",Txt_RECORD_FIELD_VISIBILITY_MENU[Vis]);
|
||||||
Txt_RECORD_FIELD_VISIBILITY_MENU[Vis]);
|
|
||||||
}
|
}
|
||||||
HTM_SELECT_End ();
|
HTM_SELECT_End ();
|
||||||
Frm_EndForm ();
|
Frm_EndForm ();
|
||||||
|
@ -362,6 +362,7 @@ void Rec_ShowFormCreateRecordField (void)
|
||||||
extern const char *Txt_RECORD_FIELD_VISIBILITY_MENU[Rec_NUM_TYPES_VISIBILITY];
|
extern const char *Txt_RECORD_FIELD_VISIBILITY_MENU[Rec_NUM_TYPES_VISIBILITY];
|
||||||
extern const char *Txt_Create_record_field;
|
extern const char *Txt_Create_record_field;
|
||||||
Rec_VisibilityRecordFields_t Vis;
|
Rec_VisibilityRecordFields_t Vis;
|
||||||
|
unsigned VisUnsigned;
|
||||||
char StrNumLines[10 + 1];
|
char StrNumLines[10 + 1];
|
||||||
|
|
||||||
/***** Begin form *****/
|
/***** Begin form *****/
|
||||||
|
@ -403,11 +404,10 @@ void Rec_ShowFormCreateRecordField (void)
|
||||||
Vis < (Rec_VisibilityRecordFields_t) Rec_NUM_TYPES_VISIBILITY;
|
Vis < (Rec_VisibilityRecordFields_t) Rec_NUM_TYPES_VISIBILITY;
|
||||||
Vis++)
|
Vis++)
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out,"<option value=\"%u\"",(unsigned) Vis);
|
VisUnsigned = (unsigned) Vis;
|
||||||
if (Gbl.Crs.Records.Field.Visibility == Vis)
|
HTM_OPTION (HTM_Type_UNSIGNED,(void *) &VisUnsigned,
|
||||||
fprintf (Gbl.F.Out," selected=\"selected\"");
|
Gbl.Crs.Records.Field.Visibility == Vis,false,
|
||||||
fprintf (Gbl.F.Out,">%s</option>",
|
"%s",Txt_RECORD_FIELD_VISIBILITY_MENU[Vis]);
|
||||||
Txt_RECORD_FIELD_VISIBILITY_MENU[Vis]);
|
|
||||||
}
|
}
|
||||||
HTM_SELECT_End ();
|
HTM_SELECT_End ();
|
||||||
HTM_TD_End ();
|
HTM_TD_End ();
|
||||||
|
@ -1499,12 +1499,9 @@ static void Rec_ShowLinkToPrintPreviewOfRecords (void)
|
||||||
for (i = Rec_MIN_RECORDS_PER_PAGE;
|
for (i = Rec_MIN_RECORDS_PER_PAGE;
|
||||||
i <= Rec_MAX_RECORDS_PER_PAGE;
|
i <= Rec_MAX_RECORDS_PER_PAGE;
|
||||||
i++)
|
i++)
|
||||||
{
|
HTM_OPTION (HTM_Type_UNSIGNED,(void *) &i,
|
||||||
fprintf (Gbl.F.Out,"<option");
|
i == Gbl.Usrs.Listing.RecsPerPag,false,
|
||||||
if (i == Gbl.Usrs.Listing.RecsPerPag)
|
"%u",i);
|
||||||
fprintf (Gbl.F.Out," selected=\"selected\"");
|
|
||||||
fprintf (Gbl.F.Out,">%u</option>",i);
|
|
||||||
}
|
|
||||||
HTM_SELECT_End ();
|
HTM_SELECT_End ();
|
||||||
fprintf (Gbl.F.Out," %s)",Txt_record_cards_per_page);
|
fprintf (Gbl.F.Out," %s)",Txt_record_cards_per_page);
|
||||||
HTM_LABEL_End ();
|
HTM_LABEL_End ();
|
||||||
|
@ -2902,6 +2899,7 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
|
||||||
bool SexForm = (TypeOfView == Rec_SHA_MY_RECORD_FORM);
|
bool SexForm = (TypeOfView == Rec_SHA_MY_RECORD_FORM);
|
||||||
Rol_Role_t DefaultRoleInForm;
|
Rol_Role_t DefaultRoleInForm;
|
||||||
Rol_Role_t Role;
|
Rol_Role_t Role;
|
||||||
|
unsigned RoleUnsigned;
|
||||||
Usr_Sex_t Sex;
|
Usr_Sex_t Sex;
|
||||||
|
|
||||||
HTM_TR_Begin (NULL);
|
HTM_TR_Begin (NULL);
|
||||||
|
@ -2938,11 +2936,10 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
|
||||||
Role <= Rol_TCH;
|
Role <= Rol_TCH;
|
||||||
Role++)
|
Role++)
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out,"<option value=\"%u\"",(unsigned) Role);
|
RoleUnsigned = (unsigned) Role;
|
||||||
if (Role == DefaultRoleInForm)
|
HTM_OPTION (HTM_Type_UNSIGNED,(void *) &RoleUnsigned,
|
||||||
fprintf (Gbl.F.Out," selected=\"selected\"");
|
Role == DefaultRoleInForm,false,
|
||||||
fprintf (Gbl.F.Out,">%s</option>",
|
"%s",Txt_ROLES_SINGUL_Abc[Role][UsrDat->Sex]);
|
||||||
Txt_ROLES_SINGUL_Abc[Role][UsrDat->Sex]);
|
|
||||||
}
|
}
|
||||||
HTM_SELECT_End ();
|
HTM_SELECT_End ();
|
||||||
break;
|
break;
|
||||||
|
@ -3002,12 +2999,9 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
|
||||||
case Rol_USR:
|
case Rol_USR:
|
||||||
case Rol_STD:
|
case Rol_STD:
|
||||||
case Rol_NET:
|
case Rol_NET:
|
||||||
fprintf (Gbl.F.Out,"<option value=\"%u\""
|
RoleUnsigned = (unsigned) Gbl.Usrs.Me.Role.Logged;
|
||||||
" selected=\"selected\""
|
HTM_OPTION (HTM_Type_UNSIGNED,(void *) &RoleUnsigned,true,true,
|
||||||
" disabled=\"disabled\">"
|
"%s",Txt_ROLES_SINGUL_Abc[Gbl.Usrs.Me.Role.Logged][UsrDat->Sex]);
|
||||||
"%s</option>",
|
|
||||||
(unsigned) Gbl.Usrs.Me.Role.Logged,
|
|
||||||
Txt_ROLES_SINGUL_Abc[Gbl.Usrs.Me.Role.Logged][UsrDat->Sex]);
|
|
||||||
break;
|
break;
|
||||||
case Rol_TCH:
|
case Rol_TCH:
|
||||||
case Rol_DEG_ADM:
|
case Rol_DEG_ADM:
|
||||||
|
@ -3018,11 +3012,10 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
|
||||||
Role <= Rol_TCH;
|
Role <= Rol_TCH;
|
||||||
Role++)
|
Role++)
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out,"<option value=\"%u\"",(unsigned) Role);
|
RoleUnsigned = (unsigned) Role;
|
||||||
if (Role == DefaultRoleInForm)
|
HTM_OPTION (HTM_Type_UNSIGNED,(void *) &RoleUnsigned,
|
||||||
fprintf (Gbl.F.Out," selected=\"selected\"");
|
Role == DefaultRoleInForm,false,
|
||||||
fprintf (Gbl.F.Out,">%s</option>",
|
"%s",Txt_ROLES_SINGUL_Abc[Role][UsrDat->Sex]);
|
||||||
Txt_ROLES_SINGUL_Abc[Role][UsrDat->Sex]);
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default: // The rest of users can not register other users
|
default: // The rest of users can not register other users
|
||||||
|
@ -3041,10 +3034,9 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
|
||||||
/***** Selector of role *****/
|
/***** Selector of role *****/
|
||||||
HTM_SELECT_Begin (false,
|
HTM_SELECT_Begin (false,
|
||||||
"id=\"Role\" name=\"Role\"");
|
"id=\"Role\" name=\"Role\"");
|
||||||
fprintf (Gbl.F.Out,"<option value=\"%u\" selected=\"selected\""
|
RoleUnsigned = (unsigned) DefaultRoleInForm;
|
||||||
" disabled=\"disabled\">%s</option>",
|
HTM_OPTION (HTM_Type_UNSIGNED,(void *) &RoleUnsigned,true,true,
|
||||||
(unsigned) DefaultRoleInForm,
|
"%s",Txt_ROLES_SINGUL_Abc[DefaultRoleInForm][UsrDat->Sex]);
|
||||||
Txt_ROLES_SINGUL_Abc[DefaultRoleInForm][UsrDat->Sex]);
|
|
||||||
HTM_SELECT_End ();
|
HTM_SELECT_End ();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -3081,11 +3073,10 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
|
||||||
Role <= Rol_TCH;
|
Role <= Rol_TCH;
|
||||||
Role++)
|
Role++)
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out,"<option value=\"%u\"",(unsigned) Role);
|
RoleUnsigned = (unsigned) Role;
|
||||||
if (Role == DefaultRoleInForm)
|
HTM_OPTION (HTM_Type_UNSIGNED,(void *) &RoleUnsigned,
|
||||||
fprintf (Gbl.F.Out," selected=\"selected\"");
|
Role == DefaultRoleInForm,false,
|
||||||
fprintf (Gbl.F.Out,">%s</option>",
|
"%s",Txt_ROLES_SINGUL_Abc[Role][Usr_SEX_UNKNOWN]);
|
||||||
Txt_ROLES_SINGUL_Abc[Role][Usr_SEX_UNKNOWN]);
|
|
||||||
}
|
}
|
||||||
HTM_SELECT_End ();
|
HTM_SELECT_End ();
|
||||||
break;
|
break;
|
||||||
|
@ -3099,9 +3090,10 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
|
||||||
/***** Selector of role *****/
|
/***** Selector of role *****/
|
||||||
HTM_SELECT_Begin (false,
|
HTM_SELECT_Begin (false,
|
||||||
"id=\"Role\" name=\"Role\"");
|
"id=\"Role\" name=\"Role\"");
|
||||||
fprintf (Gbl.F.Out,"<option value=\"%u\""
|
RoleUnsigned = (unsigned) Rol_GST;
|
||||||
" selected=\"selected\">%s</option>",
|
HTM_OPTION (HTM_Type_UNSIGNED,(void *) &RoleUnsigned,
|
||||||
(unsigned) Rol_GST,Txt_ROLES_SINGUL_Abc[Rol_GST][Usr_SEX_UNKNOWN]);
|
true,false,
|
||||||
|
"%s",Txt_ROLES_SINGUL_Abc[Rol_GST][Usr_SEX_UNKNOWN]);
|
||||||
HTM_SELECT_End ();
|
HTM_SELECT_End ();
|
||||||
break;
|
break;
|
||||||
default: // The rest of users can not register other users
|
default: // The rest of users can not register other users
|
||||||
|
@ -3288,23 +3280,16 @@ static void Rec_ShowCountry (struct UsrData *UsrDat,
|
||||||
HTM_SELECT_Begin (false,
|
HTM_SELECT_Begin (false,
|
||||||
"id=\"OthCtyCod\" name=\"OthCtyCod\""
|
"id=\"OthCtyCod\" name=\"OthCtyCod\""
|
||||||
" class=\"REC_C2_BOT_INPUT\" required=\"required\"");
|
" class=\"REC_C2_BOT_INPUT\" required=\"required\"");
|
||||||
fprintf (Gbl.F.Out,"<option value=\"\">%s</option>"
|
HTM_OPTION (HTM_Type_STRING,(void *) "",false,false,
|
||||||
"<option value=\"0\"",
|
"%s",Txt_Country);
|
||||||
Txt_Country);
|
HTM_OPTION (HTM_Type_STRING,(void *) "0",UsrDat->CtyCod == 0,false,
|
||||||
if (UsrDat->CtyCod == 0)
|
"%s",Txt_Another_country);
|
||||||
fprintf (Gbl.F.Out," selected=\"selected\"");
|
|
||||||
fprintf (Gbl.F.Out,">%s</option>",Txt_Another_country);
|
|
||||||
for (NumCty = 0;
|
for (NumCty = 0;
|
||||||
NumCty < Gbl.Hierarchy.Sys.Ctys.Num;
|
NumCty < Gbl.Hierarchy.Sys.Ctys.Num;
|
||||||
NumCty++)
|
NumCty++)
|
||||||
{
|
HTM_OPTION (HTM_Type_LONG,(void *) &Gbl.Hierarchy.Sys.Ctys.Lst[NumCty].CtyCod,
|
||||||
fprintf (Gbl.F.Out,"<option value=\"%ld\"",
|
Gbl.Hierarchy.Sys.Ctys.Lst[NumCty].CtyCod == UsrDat->CtyCod,false,
|
||||||
Gbl.Hierarchy.Sys.Ctys.Lst[NumCty].CtyCod);
|
"%s",Gbl.Hierarchy.Sys.Ctys.Lst[NumCty].Name[Gbl.Prefs.Language]);
|
||||||
if (Gbl.Hierarchy.Sys.Ctys.Lst[NumCty].CtyCod == UsrDat->CtyCod)
|
|
||||||
fprintf (Gbl.F.Out," selected=\"selected\"");
|
|
||||||
fprintf (Gbl.F.Out,">%s</option>",
|
|
||||||
Gbl.Hierarchy.Sys.Ctys.Lst[NumCty].Name[Gbl.Prefs.Language]);
|
|
||||||
}
|
|
||||||
HTM_SELECT_End ();
|
HTM_SELECT_End ();
|
||||||
HTM_TD_End ();
|
HTM_TD_End ();
|
||||||
|
|
||||||
|
@ -4027,21 +4012,15 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
|
||||||
HTM_SELECT_Begin (true,
|
HTM_SELECT_Begin (true,
|
||||||
"id=\"OthCtyCod\" name=\"OthCtyCod\""
|
"id=\"OthCtyCod\" name=\"OthCtyCod\""
|
||||||
" class=\"REC_C2_BOT_INPUT\"");
|
" class=\"REC_C2_BOT_INPUT\"");
|
||||||
fprintf (Gbl.F.Out,"<option value=\"-1\"");
|
HTM_OPTION (HTM_Type_STRING,(void *) "-1",
|
||||||
if (Gbl.Usrs.Me.UsrDat.InsCtyCod <= 0)
|
Gbl.Usrs.Me.UsrDat.InsCtyCod <= 0,true,
|
||||||
fprintf (Gbl.F.Out," selected=\"selected\"");
|
NULL);
|
||||||
fprintf (Gbl.F.Out," disabled=\"disabled\"></option>");
|
|
||||||
for (NumCty = 0;
|
for (NumCty = 0;
|
||||||
NumCty < Gbl.Hierarchy.Sys.Ctys.Num;
|
NumCty < Gbl.Hierarchy.Sys.Ctys.Num;
|
||||||
NumCty++)
|
NumCty++)
|
||||||
{
|
HTM_OPTION (HTM_Type_LONG,(void *) &Gbl.Hierarchy.Sys.Ctys.Lst[NumCty].CtyCod,
|
||||||
fprintf (Gbl.F.Out,"<option value=\"%ld\"",
|
Gbl.Hierarchy.Sys.Ctys.Lst[NumCty].CtyCod == Gbl.Usrs.Me.UsrDat.InsCtyCod,false,
|
||||||
Gbl.Hierarchy.Sys.Ctys.Lst[NumCty].CtyCod);
|
"%s",Gbl.Hierarchy.Sys.Ctys.Lst[NumCty].Name[Gbl.Prefs.Language]);
|
||||||
if (Gbl.Hierarchy.Sys.Ctys.Lst[NumCty].CtyCod == Gbl.Usrs.Me.UsrDat.InsCtyCod)
|
|
||||||
fprintf (Gbl.F.Out," selected=\"selected\"");
|
|
||||||
fprintf (Gbl.F.Out,">%s</option>",
|
|
||||||
Gbl.Hierarchy.Sys.Ctys.Lst[NumCty].Name[Gbl.Prefs.Language]);
|
|
||||||
}
|
|
||||||
HTM_SELECT_End ();
|
HTM_SELECT_End ();
|
||||||
Frm_EndForm ();
|
Frm_EndForm ();
|
||||||
HTM_TD_End ();
|
HTM_TD_End ();
|
||||||
|
@ -4069,26 +4048,18 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
|
||||||
HTM_SELECT_Begin (true,
|
HTM_SELECT_Begin (true,
|
||||||
"id=\"OthInsCod\" name=\"OthInsCod\""
|
"id=\"OthInsCod\" name=\"OthInsCod\""
|
||||||
" class=\"REC_C2_BOT_INPUT\"");
|
" class=\"REC_C2_BOT_INPUT\"");
|
||||||
fprintf (Gbl.F.Out,"<option value=\"-1\"");
|
HTM_OPTION (HTM_Type_STRING,(void *) "-1",
|
||||||
if (Gbl.Usrs.Me.UsrDat.InsCod < 0)
|
Gbl.Usrs.Me.UsrDat.InsCod < 0,true,
|
||||||
fprintf (Gbl.F.Out," selected=\"selected\"");
|
NULL);
|
||||||
fprintf (Gbl.F.Out," disabled=\"disabled\"></option>"
|
HTM_OPTION (HTM_Type_STRING,(void *) "0",
|
||||||
"<option value=\"0\"");
|
Gbl.Usrs.Me.UsrDat.InsCod == 0,false,
|
||||||
if (Gbl.Usrs.Me.UsrDat.InsCod == 0)
|
"%s",Txt_Another_institution);
|
||||||
fprintf (Gbl.F.Out," selected=\"selected\"");
|
|
||||||
fprintf (Gbl.F.Out,">%s</option>",
|
|
||||||
Txt_Another_institution);
|
|
||||||
for (NumIns = 0;
|
for (NumIns = 0;
|
||||||
NumIns < Gbl.Hierarchy.Cty.Inss.Num;
|
NumIns < Gbl.Hierarchy.Cty.Inss.Num;
|
||||||
NumIns++)
|
NumIns++)
|
||||||
{
|
HTM_OPTION (HTM_Type_LONG,(void *) Gbl.Hierarchy.Cty.Inss.Lst[NumIns].InsCod,
|
||||||
fprintf (Gbl.F.Out,"<option value=\"%ld\"",
|
Gbl.Hierarchy.Cty.Inss.Lst[NumIns].InsCod == Gbl.Usrs.Me.UsrDat.InsCod,false,
|
||||||
Gbl.Hierarchy.Cty.Inss.Lst[NumIns].InsCod);
|
"%s",Gbl.Hierarchy.Cty.Inss.Lst[NumIns].FullName);
|
||||||
if (Gbl.Hierarchy.Cty.Inss.Lst[NumIns].InsCod == Gbl.Usrs.Me.UsrDat.InsCod)
|
|
||||||
fprintf (Gbl.F.Out," selected=\"selected\"");
|
|
||||||
fprintf (Gbl.F.Out,">%s</option>",
|
|
||||||
Gbl.Hierarchy.Cty.Inss.Lst[NumIns].FullName);
|
|
||||||
}
|
|
||||||
HTM_SELECT_End ();
|
HTM_SELECT_End ();
|
||||||
Frm_EndForm ();
|
Frm_EndForm ();
|
||||||
HTM_TD_End ();
|
HTM_TD_End ();
|
||||||
|
@ -4118,26 +4089,18 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
|
||||||
HTM_SELECT_Begin (true,
|
HTM_SELECT_Begin (true,
|
||||||
"id=\"OthCtrCod\" name=\"OthCtrCod\""
|
"id=\"OthCtrCod\" name=\"OthCtrCod\""
|
||||||
" class=\"REC_C2_BOT_INPUT\"");
|
" class=\"REC_C2_BOT_INPUT\"");
|
||||||
fprintf (Gbl.F.Out,"<option value=\"-1\"");
|
HTM_OPTION (HTM_Type_STRING,(void *) "-1",
|
||||||
if (Gbl.Usrs.Me.UsrDat.Tch.CtrCod < 0)
|
Gbl.Usrs.Me.UsrDat.Tch.CtrCod < 0,true,
|
||||||
fprintf (Gbl.F.Out," selected=\"selected\"");
|
NULL);
|
||||||
fprintf (Gbl.F.Out," disabled=\"disabled\"></option>"
|
HTM_OPTION (HTM_Type_STRING,(void *) "0",
|
||||||
"<option value=\"0\"");
|
Gbl.Usrs.Me.UsrDat.Tch.CtrCod == 0,false,
|
||||||
if (Gbl.Usrs.Me.UsrDat.Tch.CtrCod == 0)
|
Txt_Another_centre);
|
||||||
fprintf (Gbl.F.Out," selected=\"selected\"");
|
|
||||||
fprintf (Gbl.F.Out,">%s</option>",
|
|
||||||
Txt_Another_centre);
|
|
||||||
for (NumCtr = 0;
|
for (NumCtr = 0;
|
||||||
NumCtr < Gbl.Hierarchy.Ins.Ctrs.Num;
|
NumCtr < Gbl.Hierarchy.Ins.Ctrs.Num;
|
||||||
NumCtr++)
|
NumCtr++)
|
||||||
{
|
HTM_OPTION (HTM_Type_LONG,(void *) &Gbl.Hierarchy.Ins.Ctrs.Lst[NumCtr].CtrCod,
|
||||||
fprintf (Gbl.F.Out,"<option value=\"%ld\"",
|
Gbl.Hierarchy.Ins.Ctrs.Lst[NumCtr].CtrCod == Gbl.Usrs.Me.UsrDat.Tch.CtrCod,false,
|
||||||
Gbl.Hierarchy.Ins.Ctrs.Lst[NumCtr].CtrCod);
|
Gbl.Hierarchy.Ins.Ctrs.Lst[NumCtr].FullName);
|
||||||
if (Gbl.Hierarchy.Ins.Ctrs.Lst[NumCtr].CtrCod == Gbl.Usrs.Me.UsrDat.Tch.CtrCod)
|
|
||||||
fprintf (Gbl.F.Out," selected=\"selected\"");
|
|
||||||
fprintf (Gbl.F.Out,">%s</option>",
|
|
||||||
Gbl.Hierarchy.Ins.Ctrs.Lst[NumCtr].FullName);
|
|
||||||
}
|
|
||||||
HTM_SELECT_End ();
|
HTM_SELECT_End ();
|
||||||
Frm_EndForm ();
|
Frm_EndForm ();
|
||||||
HTM_TD_End ();
|
HTM_TD_End ();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user