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

Version 23.4.1: Sep 15, 2023 Changes in listing and edition of courses.

This commit is contained in:
acanas 2023-09-15 09:46:56 +02:00
parent 89d098a4a0
commit 8e6628061f
4 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swad_center.c
View File

@ -1839,7 +1839,7 @@ static void Ctr_EditingCenterConstructor (void)
Err_NotEnoughMemoryExit ();
/***** Reset center *****/
Ctr_EditingCtr->Cod = -1L;
Ctr_EditingCtr->Cod = -1L;
Ctr_EditingCtr->PrtCod = -1L;
Ctr_EditingCtr->PlcCod = -1L;
Ctr_EditingCtr->Status = (Hie_Status_t) 0;

3
swad_changelog.h
View File

@ -632,10 +632,11 @@ TODO: Francisco Javier Fern
Me sale este error, no sé si por no recordar yo la sintaxis apropiada para mandar a varios destinatarios. ¿No era así?
"can npt create received message (duplicated entry '243218-2160773' for key 'UsrCod_MsgCod')
*/
#define Log_PLATFORM_VERSION "SWAD 23.4 (2023-09-15)"
#define Log_PLATFORM_VERSION "SWAD 23.4.1 (2023-09-15)"
#define CSS_FILE "swad22.120.4.css"
#define JS_FILE "swad22.49.js"
/*
Version 23.4.1: Sep 15, 2023 Changes in listing and edition of courses. (337619 lines)
Version 23.4: Sep 15, 2023 Code refactoring in hierarchy. (337618 lines)
Version 23.3: Sep 14, 2023 Buttons to close browser tab in matches are replaced because they no longer work in Firefox. (337618 lines)
Version 23.2: Sep 14, 2023 Code refactoring in hierarchy. (337604 lines)

84
swad_course.c
View File

@ -963,18 +963,18 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
" ");
HTM_TD_End ();
/* Institutional code of the course */
HTM_TD_Begin ("class=\"CM %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Txt (Crs->InstitutionalCod);
HTM_TD_End ();
/* Course year */
HTM_TD_Begin ("class=\"CM %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Txt (Txt_YEAR_OF_DEGREE[Crs->Year]);
HTM_TD_End ();
/* Institutional code of the course */
HTM_TD_Begin ("class=\"CM %s_%s %s\"",
TxtClassNormal,The_GetSuffix (),BgColor);
HTM_Txt (Crs->InstitutionalCod);
HTM_TD_End ();
/* Course full name */
HTM_TD_Begin ("class=\"LM %s_%s %s\"",
TxtClassStrong,The_GetSuffix (),BgColor);
@ -1158,22 +1158,6 @@ static void Crs_ListCoursesOfAYearForEdition (unsigned Year)
HTM_Long (Crs->Cod);
HTM_TD_End ();
/* Institutional code of the course */
HTM_TD_Begin ("class=\"CM DAT_%s\"",The_GetSuffix ());
if (ICanEdit)
{
Frm_BeginForm (ActChgInsCrsCod);
ParCod_PutPar (ParCod_OthHie,Crs->Cod);
HTM_INPUT_TEXT ("InsCrsCod",Crs_MAX_CHARS_INSTITUTIONAL_COD,
Crs->InstitutionalCod,HTM_SUBMIT_ON_CHANGE,
"class=\"INPUT_INS_CODE INPUT_%s\"",
The_GetSuffix ());
Frm_EndForm ();
}
else
HTM_Txt (Crs->InstitutionalCod);
HTM_TD_End ();
/* Course year */
HTM_TD_Begin ("class=\"CM DAT_%s\"",The_GetSuffix ());
if (ICanEdit)
@ -1201,6 +1185,22 @@ static void Crs_ListCoursesOfAYearForEdition (unsigned Year)
HTM_Txt (Txt_YEAR_OF_DEGREE[Crs->Year]);
HTM_TD_End ();
/* Institutional code of the course */
HTM_TD_Begin ("class=\"CM DAT_%s\"",The_GetSuffix ());
if (ICanEdit)
{
Frm_BeginForm (ActChgInsCrsCod);
ParCod_PutPar (ParCod_OthHie,Crs->Cod);
HTM_INPUT_TEXT ("InsCrsCod",Crs_MAX_CHARS_INSTITUTIONAL_COD,
Crs->InstitutionalCod,HTM_SUBMIT_ON_CHANGE,
"class=\"INPUT_INS_CODE INPUT_%s\"",
The_GetSuffix ());
Frm_EndForm ();
}
else
HTM_Txt (Crs->InstitutionalCod);
HTM_TD_End ();
/* Course short name */
HTM_TD_Begin ("class=\"LM DAT_%s\"",The_GetSuffix ());
if (ICanEdit)
@ -1314,15 +1314,6 @@ static void Crs_PutFormToCreateCourse (void)
HTM_TD_Begin ("class=\"CODE\"");
HTM_TD_End ();
/***** Institutional code of the course *****/
HTM_TD_Begin ("class=\"CM\"");
HTM_INPUT_TEXT ("InsCrsCod",Crs_MAX_CHARS_INSTITUTIONAL_COD,
Crs_EditingCrs->InstitutionalCod,
HTM_DONT_SUBMIT_ON_CHANGE,
"class=\"INPUT_INS_CODE INPUT_%s\"",
The_GetSuffix ());
HTM_TD_End ();
/***** Year *****/
HTM_TD_Begin ("class=\"CM\"");
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,NULL,
@ -1340,6 +1331,15 @@ static void Crs_PutFormToCreateCourse (void)
HTM_SELECT_End ();
HTM_TD_End ();
/***** Institutional code of the course *****/
HTM_TD_Begin ("class=\"CM\"");
HTM_INPUT_TEXT ("InsCrsCod",Crs_MAX_CHARS_INSTITUTIONAL_COD,
Crs_EditingCrs->InstitutionalCod,
HTM_DONT_SUBMIT_ON_CHANGE,
"class=\"INPUT_INS_CODE INPUT_%s\"",
The_GetSuffix ());
HTM_TD_End ();
/***** Course short name *****/
HTM_TD_Begin ("class=\"LM\"");
HTM_INPUT_TEXT ("ShortName",Cns_HIERARCHY_MAX_CHARS_SHRT_NAME,Crs_EditingCrs->ShrtName,
@ -1389,16 +1389,16 @@ static void Crs_PutFormToCreateCourse (void)
static void Crs_PutHeadCoursesForSeeing (void)
{
extern const char *Txt_Institutional_BR_code;
extern const char *Txt_Year_OF_A_DEGREE;
extern const char *Txt_Institutional_BR_code;
extern const char *Txt_Course;
extern const char *Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NUM_ROLES];
HTM_TR_Begin (NULL);
HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT");
HTM_TH (Txt_Institutional_BR_code ,HTM_HEAD_CENTER);
HTM_TH (Txt_Year_OF_A_DEGREE ,HTM_HEAD_CENTER);
HTM_TH (Txt_Institutional_BR_code ,HTM_HEAD_CENTER);
HTM_TH (Txt_Course ,HTM_HEAD_LEFT );
HTM_TH (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],HTM_HEAD_RIGHT );
HTM_TH (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],HTM_HEAD_RIGHT );
@ -1414,9 +1414,9 @@ static void Crs_PutHeadCoursesForSeeing (void)
static void Crs_PutHeadCoursesForEdition (void)
{
extern const char *Txt_Code;
extern const char *Txt_Institutional_code;
extern const char *Txt_optional;
extern const char *Txt_Year_OF_A_DEGREE;
extern const char *Txt_Institutional_code;
extern const char *Txt_Short_name_of_the_course;
extern const char *Txt_Full_name_of_the_course;
extern const char *Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NUM_ROLES];
@ -1426,10 +1426,10 @@ static void Crs_PutHeadCoursesForEdition (void)
HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT");
HTM_TH (Txt_Code ,HTM_HEAD_RIGHT );
HTM_TH (Txt_Year_OF_A_DEGREE ,HTM_HEAD_CENTER);
HTM_TH_Begin (HTM_HEAD_CENTER);
HTM_TxtF ("%s (%s)",Txt_Institutional_code,Txt_optional);
HTM_TH_End ();
HTM_TH (Txt_Year_OF_A_DEGREE ,HTM_HEAD_CENTER);
HTM_TH (Txt_Short_name_of_the_course ,HTM_HEAD_LEFT );
HTM_TH (Txt_Full_name_of_the_course ,HTM_HEAD_LEFT );
HTM_TH (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],HTM_HEAD_RIGHT );
@ -1528,13 +1528,13 @@ static void Crs_GetParsNewCourse (struct Crs_Course *Crs)
char YearStr[2 + 1];
/***** Get parameters of the course from form *****/
/* Get institutional code */
Par_GetParText ("InsCrsCod",Crs->InstitutionalCod,Crs_MAX_BYTES_INSTITUTIONAL_COD);
/* Get year */
Par_GetParText ("OthCrsYear",YearStr,2);
Crs->Year = Deg_ConvStrToYear (YearStr);
/* Get institutional code */
Par_GetParText ("InsCrsCod",Crs->InstitutionalCod,Crs_MAX_BYTES_INSTITUTIONAL_COD);
/* Get course short name */
Par_GetParText ("ShortName",Crs->ShrtName,Cns_HIERARCHY_MAX_BYTES_SHRT_NAME);
@ -1641,9 +1641,6 @@ static void Crs_GetCourseDataFromRow (MYSQL_RES *mysql_res,
/***** Get year (row[2]) *****/
Crs->Year = Deg_ConvStrToYear (row[2]);
/***** Get institutional course code (row[3]) *****/
Str_Copy (Crs->InstitutionalCod,row[3],sizeof (Crs->InstitutionalCod) - 1);
/***** Get course status (row[4]) *****/
if (sscanf (row[4],"%u",&(Crs->Status)) != 1)
Err_WrongStatusExit ();
@ -1651,6 +1648,9 @@ static void Crs_GetCourseDataFromRow (MYSQL_RES *mysql_res,
/***** Get requester user'code (row[5]) *****/
Crs->RequesterUsrCod = Str_ConvertStrCodToLongCod (row[5]);
/***** Get institutional course code (row[3]) *****/
Str_Copy (Crs->InstitutionalCod,row[3],sizeof (Crs->InstitutionalCod) - 1);
/***** Get short name (row[6]) and full name (row[7]) of the course *****/
Str_Copy (Crs->ShrtName,row[6],sizeof (Crs->ShrtName) - 1);
Str_Copy (Crs->FullName,row[7],sizeof (Crs->FullName) - 1);
@ -2613,9 +2613,9 @@ static void Crs_EditingCourseConstructor (void)
/***** Reset course *****/
Crs_EditingCrs->Cod = -1L;
Crs_EditingCrs->PrtCod = -1L;
Crs_EditingCrs->InstitutionalCod[0] = '\0';
Crs_EditingCrs->Year = 0;
Crs_EditingCrs->Status = 0;
Crs_EditingCrs->InstitutionalCod[0] = '\0';
Crs_EditingCrs->ShrtName[0] = '\0';
Crs_EditingCrs->FullName[0] = '\0';
}

2
swad_course.h
View File

@ -56,10 +56,10 @@ struct Crs_Course
{
long Cod; // Course code
long PrtCod; // Parent (degree) code
char InstitutionalCod[Crs_MAX_BYTES_INSTITUTIONAL_COD + 1]; // Institutional code of the course
unsigned Year; // Year: 0 (optatives), 1, 2, 3...
Hie_Status_t Status; // Course status
long RequesterUsrCod; // User code of the person who requested the creation of this course
char InstitutionalCod[Crs_MAX_BYTES_INSTITUTIONAL_COD + 1]; // Institutional code of the course
char ShrtName[Cns_HIERARCHY_MAX_BYTES_SHRT_NAME + 1]; // Short name of course
char FullName[Cns_HIERARCHY_MAX_BYTES_FULL_NAME + 1]; // Full name of course
};