From e31a5cf0d47d2396db651aecea87548a7d6f3eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 8 May 2017 20:48:27 +0200 Subject: [PATCH] Version 16.208.4 --- swad_changelog.h | 3 ++- swad_record.c | 40 ++++++++++++++++++++++++++-------------- swad_record.h | 8 +++++--- 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 6e555b2dd..9228362cb 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -234,13 +234,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.208.3 (2017-05-08)" +#define Log_PLATFORM_VERSION "SWAD 16.208.4 (2017-05-08)" #define CSS_FILE "swad16.207.css" #define JS_FILE "swad16.206.3.js" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1 /* + Version 16.208.4: May 08, 2017 Changes in edition of students records. (218728 lines) Version 16.208.3: May 08, 2017 Changes in edition of students records. (218713 lines) Version 16.208.2: May 08, 2017 Changes in confirmation of user's ID. (218704 lines) Version 16.208.1: May 08, 2017 Fixed problem in character encoding in files of marks, reported by Sandra Daniela Tazzioli Barroso. (218696 lines) diff --git a/swad_record.c b/swad_record.c index c44d9e814..562077fdb 100644 --- a/swad_record.c +++ b/swad_record.c @@ -1111,7 +1111,7 @@ static void Rec_ShowRecordOneStdCrs (void) { if (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER || Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) - Rec_ShowCrsRecord (Rec_CRS_RECORD_LIST,&Gbl.Usrs.Other.UsrDat,NULL); + Rec_ShowCrsRecord (Rec_CRS_LIST_ONE_RECORD,&Gbl.Usrs.Other.UsrDat,NULL); else if (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT && Gbl.Usrs.Me.UsrDat.UsrCod == Gbl.Usrs.Other.UsrDat.UsrCod) // It's me Rec_ShowCrsRecord (Rec_CRS_MY_RECORD_AS_STUDENT_FORM,&Gbl.Usrs.Other.UsrDat,NULL); @@ -1128,13 +1128,13 @@ static void Rec_ShowRecordOneStdCrs (void) void Rec_ListRecordsStdsForEdit (void) { Rec_ListRecordsStds (Rec_SHA_RECORD_LIST, - Rec_CRS_RECORD_LIST); + Rec_CRS_LIST_SEVERAL_RECORDS); } void Rec_ListRecordsStdsForPrint (void) { Rec_ListRecordsStds (Rec_SHA_RECORD_PRINT, - Rec_CRS_RECORD_PRINT); + Rec_CRS_PRINT_SEVERAL_RECORDS); } static void Rec_ListRecordsStds (Rec_SharedRecordViewType_t ShaTypeOfView, @@ -1610,8 +1610,11 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView, { Hlp_USERS_Students_course_record_card, // Rec_CRS_MY_RECORD_AS_STUDENT_FORM Hlp_USERS_Students_course_record_card, // Rec_CRS_MY_RECORD_AS_STUDENT_CHECK - Hlp_USERS_Students_course_record_card, // Rec_CRS_RECORD_LIST - NULL, // Rec_CRS_RECORD_PRINT + Hlp_USERS_Students_course_record_card, // Rec_CRS_LIST_ONE_RECORD + Hlp_USERS_Students_course_record_card, // Rec_CRS_LIST_SEVERAL_RECORDS + NULL, // Rec_CRS_PRINT_ONE_RECORD + NULL, // Rec_CRS_PRINT_SEVERAL_RECORDS + // Rec_CRS_RECORD_PRINT }; char StrRecordWidth[10 + 1]; unsigned Col1Width = 210; @@ -1632,15 +1635,15 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView, if (ItsMe) // It's me switch (TypeOfView) { - case Rec_CRS_RECORD_LIST: - // When listing several records, - // only my record in course in allowed - // ==> show form to edit my record as student + case Rec_CRS_LIST_ONE_RECORD: + case Rec_CRS_LIST_SEVERAL_RECORDS: + // When listing records, I can see only my record as student TypeOfView = Rec_CRS_MY_RECORD_AS_STUDENT_FORM; break; case Rec_CRS_MY_RECORD_AS_STUDENT_FORM: case Rec_CRS_MY_RECORD_AS_STUDENT_CHECK: - case Rec_CRS_RECORD_PRINT: + case Rec_CRS_PRINT_ONE_RECORD: + case Rec_CRS_PRINT_SEVERAL_RECORDS: break; default: Lay_ShowErrorAndExit (Txt_You_dont_have_permission_to_perform_this_action); @@ -1665,13 +1668,20 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView, break; case Rec_CRS_MY_RECORD_AS_STUDENT_CHECK: break; - case Rec_CRS_RECORD_LIST: + case Rec_CRS_LIST_ONE_RECORD: + ICanEdit = true; + Act_FormStartAnchor (ActRcvRecOthUsr,Anchor); + // Usr_PutHiddenParUsrCodAll (ActRcvRecOthUsr,Gbl.Usrs.Select.All); // TODO: Remove this line + Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); + break; + case Rec_CRS_LIST_SEVERAL_RECORDS: ICanEdit = true; Act_FormStartAnchor (ActRcvRecOthUsr,Anchor); Usr_PutHiddenParUsrCodAll (ActRcvRecOthUsr,Gbl.Usrs.Select.All); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); break; - case Rec_CRS_RECORD_PRINT: + case Rec_CRS_PRINT_ONE_RECORD: + case Rec_CRS_PRINT_SEVERAL_RECORDS: break; default: break; @@ -1715,7 +1725,8 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView, // If the field must be shown... if (ShowField) { - ICanEditThisField = TypeOfView == Rec_CRS_RECORD_LIST || + ICanEditThisField = TypeOfView == Rec_CRS_LIST_ONE_RECORD || + TypeOfView == Rec_CRS_LIST_SEVERAL_RECORDS || (TypeOfView == Rec_CRS_MY_RECORD_AS_STUDENT_FORM && Gbl.CurrentCrs.Records.LstFields.Lst[NumField].Visibility == Rec_EDITABLE_FIELD); @@ -1728,7 +1739,8 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView, "REC_DAT_SMALL", Gbl.RowEvenOdd,Col1Width, Gbl.CurrentCrs.Records.LstFields.Lst[NumField].Name); - if (TypeOfView == Rec_CRS_RECORD_LIST) + if (TypeOfView == Rec_CRS_LIST_ONE_RECORD || + TypeOfView == Rec_CRS_LIST_SEVERAL_RECORDS) fprintf (Gbl.F.Out," (%s)", Txt_RECORD_FIELD_VISIBILITY_RECORD[Gbl.CurrentCrs.Records.LstFields.Lst[NumField].Visibility]); fprintf (Gbl.F.Out,""); diff --git a/swad_record.h b/swad_record.h index 3ba429b78..1c4729c8c 100644 --- a/swad_record.h +++ b/swad_record.h @@ -69,13 +69,15 @@ typedef enum Rec_SHA_RECORD_PUBLIC, } Rec_SharedRecordViewType_t; -#define Rec_COURSE_NUM_VIEW_TYPES 4 +#define Rec_COURSE_NUM_VIEW_TYPES 6 typedef enum { Rec_CRS_MY_RECORD_AS_STUDENT_FORM, Rec_CRS_MY_RECORD_AS_STUDENT_CHECK, - Rec_CRS_RECORD_LIST, - Rec_CRS_RECORD_PRINT, + Rec_CRS_LIST_ONE_RECORD, + Rec_CRS_LIST_SEVERAL_RECORDS, + Rec_CRS_PRINT_ONE_RECORD, + Rec_CRS_PRINT_SEVERAL_RECORDS, } Rec_CourseRecordViewType_t; typedef enum {