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 17.5.6

This commit is contained in:
Antonio Cañas Vargas 2017-09-21 21:10:52 +02:00
parent 5db8a17783
commit 6d3322da24
6 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
swad_action.c
View File

@ -464,10 +464,10 @@ Assessment:
NEW. ActShoPrj Show project
NEW. ActReqAddStdPrj Request adding a student to a project
NEW. ActReqAddTutPrj Request adding a tutor to a project
NEW. ActReqAddRevPrj Request adding a reviewer to a project
NEW. ActReqAddEvaPrj Request adding a reviewer to a project
NEW. ActAddStdPrj Add a student to a project
NEW. ActAddTutPrj Add a tutor to a project
NEW. ActAddRevPrj Add a reviewer to a project
NEW. ActAddEvaPrj Add a reviewer to a project
313. ActSeeTst Show the seft-assessment test
314. ActAssTst Assess a self-assessment test
@ -1961,10 +1961,10 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActShoPrj */{1683,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ShowProject ,NULL},
/* ActReqAddStdPrj */{1684,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReqAddStd ,NULL},
/* ActReqAddTutPrj */{1685,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReqAddTut ,NULL},
/* ActReqAddRevPrj */{1686,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReqAddRev ,NULL},
/* ActReqAddEvaPrj */{1686,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReqAddEva ,NULL},
/* ActAddStdPrj */{1687,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_AddStd ,NULL},
/* ActAddTutPrj */{1688,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_AddTut ,NULL},
/* ActAddRevPrj */{1689,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_AddRev ,NULL},
/* ActAddEvaPrj */{1689,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_AddEva ,NULL},
/* ActSeeTst */{ 29,-1,TabUnk,ActReqTst ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Tst_ShowNewTest ,NULL},
/* ActAssTst */{ 98,-1,TabUnk,ActReqTst ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Tst_AssessTest ,NULL},
@ -4777,10 +4777,10 @@ Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD] = // Do not reuse un
ActShoPrj, // #1683
ActReqAddStdPrj, // #1684
ActReqAddTutPrj, // #1685
ActReqAddRevPrj, // #1686
ActReqAddEvaPrj, // #1686
ActAddStdPrj, // #1687
ActAddTutPrj, // #1688
ActAddRevPrj, // #1689
ActAddEvaPrj, // #1689
};
/*****************************************************************************/

4
swad_action.h
View File

@ -474,10 +474,10 @@ typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to
#define ActShoPrj (ActChgCalCrs1stDay + 36)
#define ActReqAddStdPrj (ActChgCalCrs1stDay + 37)
#define ActReqAddTutPrj (ActChgCalCrs1stDay + 38)
#define ActReqAddRevPrj (ActChgCalCrs1stDay + 39)
#define ActReqAddEvaPrj (ActChgCalCrs1stDay + 39)
#define ActAddStdPrj (ActChgCalCrs1stDay + 40)
#define ActAddTutPrj (ActChgCalCrs1stDay + 41)
#define ActAddRevPrj (ActChgCalCrs1stDay + 42)
#define ActAddEvaPrj (ActChgCalCrs1stDay + 42)
#define ActSeeTst (ActChgCalCrs1stDay + 43)
#define ActAssTst (ActChgCalCrs1stDay + 44)

3
swad_changelog.h
View File

@ -252,13 +252,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 17.5.5 (2017-09-21)"
#define Log_PLATFORM_VERSION "SWAD 17.5.6 (2017-09-21)"
#define CSS_FILE "swad17.0.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 17.5.6: Sep 21, 2017 Added evaluators to projects. (230347 lines)
Version 17.5.5: Sep 21, 2017 Changes in listing and edition of projects. (230318 lines)
Version 17.5.4: Sep 21, 2017 Added field in projects for department. (230304 lines)
2 changes necessary in database:

27
swad_project.c
View File

@ -61,7 +61,7 @@ typedef enum
Prj_ROLE_UNK = 0, // Unknown
Prj_ROLE_STD = 1, // Student
Prj_ROLE_TUT = 2, // Tutor
Prj_ROLE_REV = 3, // Reviewer
Prj_ROLE_EVA = 3, // Evaluator
} Prj_RoleInProject_t;
typedef enum
@ -363,9 +363,10 @@ static void Prj_ShowOneProject (struct Project *Prj,Prj_ProjectView_t ProjectVie
extern const char *Txt_Description;
extern const char *Txt_Required_knowledge;
extern const char *Txt_Required_materials;
extern const char *Txt_Tutors;
extern const char *Txt_Preassigned_QUESTION;
extern const char *Txt_Tutors;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Evaluators;
static unsigned UniqueId = 0;
/***** Get data of this project *****/
@ -374,7 +375,7 @@ static void Prj_ShowOneProject (struct Project *Prj,Prj_ProjectView_t ProjectVie
/***** Write first row of data of this project *****/
/* Forms to remove/edit this project */
fprintf (Gbl.F.Out,"<tr>"
"<td rowspan=\"7\" class=\"CONTEXT_COL");
"<td rowspan=\"8\" class=\"CONTEXT_COL");
if (ProjectView == Prj_LIST_PROJECTS)
{
fprintf (Gbl.F.Out," COLOR%u\">",Gbl.RowEvenOdd);
@ -504,6 +505,10 @@ static void Prj_ShowOneProject (struct Project *Prj,Prj_ProjectView_t ProjectVie
Prj_ShowOneProjectUsrsRow (Prj,ProjectView,
Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN],Prj_ROLE_STD);
/* Project evaluators */
Prj_ShowOneProjectUsrsRow (Prj,ProjectView,
Txt_Evaluators,Prj_ROLE_EVA);
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
}
@ -613,7 +618,7 @@ static void Prj_WriteUsrs (long PrjCod,Prj_ProjectView_t ProjectView,
ActUnk, // Prj_ROLE_UNK, Unknown
ActReqAddStdPrj, // Prj_ROLE_STD, Student
ActReqAddTutPrj, // Prj_ROLE_TUT, Tutor
ActReqAddRevPrj, // Prj_ROLE_REV, Reviewer
ActReqAddEvaPrj, // Prj_ROLE_EVA, Evaluator
};
/***** Get number of users in project from database *****/
@ -731,9 +736,9 @@ void Prj_ReqAddTut (void)
Prj_ReqAnotherUsrID (Prj_ROLE_TUT);
}
void Prj_ReqAddRev (void)
void Prj_ReqAddEva (void)
{
Prj_ReqAnotherUsrID (Prj_ROLE_REV);
Prj_ReqAnotherUsrID (Prj_ROLE_EVA);
}
static void Prj_ReqAnotherUsrID (Prj_RoleInProject_t RoleInProject)
@ -745,7 +750,7 @@ static void Prj_ReqAnotherUsrID (Prj_RoleInProject_t RoleInProject)
ActUnk, // Prj_ROLE_UNK, Unknown
ActAddStdPrj, // Prj_ROLE_STD, Student
ActAddTutPrj, // Prj_ROLE_TUT, Tutor
ActAddRevPrj, // Prj_ROLE_REV, Reviewer
ActAddEvaPrj, // Prj_ROLE_EVA, Evaluator
};
/***** Get project code *****/
@ -780,9 +785,9 @@ void Prj_AddTut (void)
Prj_AddUsrToProject (Prj_ROLE_TUT);
}
void Prj_AddRev (void)
void Prj_AddEva (void)
{
Prj_AddUsrToProject (Prj_ROLE_REV);
Prj_AddUsrToProject (Prj_ROLE_EVA);
}
static void Prj_AddUsrToProject (Prj_RoleInProject_t RoleInProject)
@ -1378,6 +1383,7 @@ static void Prj_RequestCreatOrEditPrj (long PrjCod)
extern const char *Txt_Project_members;
extern const char *Txt_Tutors;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Evaluators;
struct Project Prj;
bool ItsANewProject;
@ -1510,6 +1516,9 @@ static void Prj_RequestCreatOrEditPrj (long PrjCod)
Prj_ShowOneProjectUsrsRow (&Prj,Prj_EDIT_ONE_PROJECT,
Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN],
Prj_ROLE_STD); // Students
Prj_ShowOneProjectUsrsRow (&Prj,Prj_EDIT_ONE_PROJECT,
Txt_Evaluators,
Prj_ROLE_EVA); // Evaluators
Box_EndBoxTable ();
}

4
swad_project.h
View File

@ -71,11 +71,11 @@ void Prj_PrintOneProject (void);
void Prj_ReqAddStd (void);
void Prj_ReqAddTut (void);
void Prj_ReqAddRev (void);
void Prj_ReqAddEva (void);
void Prj_AddStd (void);
void Prj_AddTut (void);
void Prj_AddRev (void);
void Prj_AddEva (void);
void Prj_PutHiddenParamPrjOrder (void);

21
swad_text.c
View File

@ -11485,6 +11485,27 @@ const char *Txt_Error_receiving_or_processing_image =
"Erro no recebimento ou processamento de imagem.";
#endif
const char *Txt_Evaluators =
#if L==1
"Avaluadors";
#elif L==2
"Auswerter";
#elif L==3
"Evaluators";
#elif L==4
"Evaluadores";
#elif L==5
"&Eacute;valuateurs";
#elif L==6
"Evaluadores"; // Okoteve traducción
#elif L==7
"Valutatori";
#elif L==8
"Oceniaj&aogon;cy";
#elif L==9
"Avaliadores";
#endif
const char *Txt_Event =
#if L==1
"Esdeveniment";