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.11.6

This commit is contained in:
Antonio Cañas Vargas 2017-10-01 11:57:25 +02:00
parent 2b67c53850
commit c7f52d15a5
4 changed files with 219 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_changelog.h
View File

@ -252,15 +252,16 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 17.11.5 (2017-10-01)"
#define Log_PLATFORM_VERSION "SWAD 17.11.6 (2017-10-01)"
#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.11.6: Oct 01, 2017 Fixed bug in edition of projects. (231632 lines)
Version 17.11.5: Oct 01, 2017 Changes in order of roles in projects.
Changes in edition of assignments, surveys and attendance events. (231536 lines)
Changes in edition of assignments, games, surveys and attendance events. (231536 lines)
Version 17.11.4: Sep 30, 2017 Changes in edition of a project. (231521 lines)
Version 17.11.3: Sep 30, 2017 Changes in layout of projects. (231517 lines)
Version 17.11.2: Sep 30, 2017 Changes in layout of projects. (231511 lines)

5
swad_game.c
View File

@ -1782,7 +1782,10 @@ void Gam_RequestCreatOrEditGame (void)
Box_StartBoxTable (NULL,Txt_New_game,NULL,
Hlp_ASSESSMENT_Games_new_game,Box_NOT_CLOSABLE,2);
else
Box_StartBoxTable (NULL,Txt_Edit_game,NULL,
Box_StartBoxTable (NULL,
Game.Title[0] ? Game.Title :
Txt_Edit_game,
NULL,
Hlp_ASSESSMENT_Games_edit_game,Box_NOT_CLOSABLE,2);
/***** Scope of the game *****/

44
swad_project.c
View File

@ -647,6 +647,9 @@ static void Prj_ShowOneProject (struct Project *Prj,Prj_ProjectView_t ProjectVie
/* Department */
Prj_ShowOneProjectDepartment (Prj,ProjectView);
/***** Project members *****/
Prj_ShowOneProjectMembers (Prj,ProjectView);
/***** Write rows of data of this project *****/
/* Description of the project */
Prj_ShowOneProjectTxtField (Prj,ProjectView,
@ -686,9 +689,6 @@ static void Prj_ShowOneProject (struct Project *Prj,Prj_ProjectView_t ProjectVie
(Prj->Preassigned == Prj_PREASSIGNED) ? Txt_Yes :
Txt_No);
/* Project members */
Prj_ShowOneProjectMembers (Prj,ProjectView);
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
}
@ -981,24 +981,26 @@ static void Prj_ShowOneProjectMembersWithARole (const struct Project *Prj,
Prj_ProjectView_t ProjectView,
Prj_RoleInProject_t RoleInProject)
{
extern const char *Txt_PROJECT_ROLES_SINGUL_Abc[Prj_NUM_ROLES_IN_PROJECT];
extern const char *Txt_PROJECT_ROLES_PLURAL_Abc[Prj_NUM_ROLES_IN_PROJECT];
extern const char *Txt_Remove;
extern const char *Txt_Add_USER;
extern const char *Txt_PROJECT_ROLES_SINGUL_abc[Prj_NUM_ROLES_IN_PROJECT];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
bool WriteRow;
unsigned NumUsr;
unsigned NumUsrs;
bool ShowPhoto;
char PhotoURL[PATH_MAX + 1];
static Act_Action_t ActionReqRemUsr[Prj_NUM_ROLES_IN_PROJECT] =
static const Act_Action_t ActionReqRemUsr[Prj_NUM_ROLES_IN_PROJECT] =
{
ActUnk, // Prj_ROLE_UNK, Unknown
ActReqRemStdPrj, // Prj_ROLE_STD, Student
ActReqRemTutPrj, // Prj_ROLE_TUT, Tutor
ActReqRemEvaPrj, // Prj_ROLE_EVA, Evaluator
};
static Act_Action_t ActionReqAddUsr[Prj_NUM_ROLES_IN_PROJECT] =
static const Act_Action_t ActionReqAddUsr[Prj_NUM_ROLES_IN_PROJECT] =
{
ActUnk, // Prj_ROLE_UNK, Unknown
ActReqAddStdPrj, // Prj_ROLE_STD, Student
@ -1008,9 +1010,14 @@ static void Prj_ShowOneProjectMembersWithARole (const struct Project *Prj,
/***** Get users in project from database *****/
NumUsrs = Prj_GetUsrsInPrj (Prj->PrjCod,RoleInProject,&mysql_res);
WriteRow = (NumUsrs != 0 ||
ProjectView == Prj_EDIT_ONE_PROJECT);
if (WriteRow)
{
/***** Start row with label and listing of users *****/
fprintf (Gbl.F.Out,"<tr>");
switch (ProjectView)
{
case Prj_LIST_PROJECTS:
@ -1019,6 +1026,7 @@ static void Prj_ShowOneProjectMembersWithARole (const struct Project *Prj,
Gbl.RowEvenOdd,
Prj->Hidden ? "ASG_LABEL_LIGHT" :
"ASG_LABEL",
NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] :
Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject],
Gbl.RowEvenOdd,
Prj->Hidden ? "DAT_LIGHT" :
@ -1029,6 +1037,7 @@ static void Prj_ShowOneProjectMembersWithARole (const struct Project *Prj,
"<td colspan=\"2\" class=\"LEFT_TOP %s\">",
Prj->Hidden ? "ASG_LABEL_LIGHT" :
"ASG_LABEL",
NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] :
Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject],
Prj->Hidden ? "DAT_LIGHT" :
"DAT");
@ -1117,14 +1126,15 @@ static void Prj_ShowOneProjectMembersWithARole (const struct Project *Prj,
/***** End table with all members with this role *****/
Tbl_EndTable ();
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);
/***** End row with label and listing of users *****/
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);
}
static void Prj_ShowTableAllProjectsMembersWithARole (const struct Project *Prj,
Prj_RoleInProject_t RoleInProject)
{
@ -2180,25 +2190,22 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
extern const char *Txt_Members;
unsigned NumRoleToShow;
/***** Start box and form *****/
/***** Start project box *****/
if (ItsANewProject)
{
Gbl.Prjs.PrjCodToEdit = -1L;
Box_StartBox (NULL,Txt_New_project,NULL,
Hlp_ASSESSMENT_Projects_new_project,Box_NOT_CLOSABLE);
Act_FormStart (ActNewPrj);
Gbl.Prjs.PrjCodToEdit = -1L;
}
else
{
Gbl.Prjs.PrjCodToEdit = Prj->PrjCod;
Box_StartBox (NULL,
Prj->Title[0] ? Prj->Title :
Txt_Edit_project,
NULL,
Hlp_ASSESSMENT_Projects_edit_project,Box_NOT_CLOSABLE);
Act_FormStart (ActChgPrj);
Gbl.Prjs.PrjCodToEdit = Prj->PrjCod;
}
Prj_PutParams ();
/***** 1. Project members *****/
if (!ItsANewProject) // Existing project
@ -2214,6 +2221,11 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
}
/***** 2. Project data *****/
/* Start data form */
Act_FormStart (ItsANewProject ? ActNewPrj :
ActChgPrj);
Prj_PutParams ();
/* Start box and table */
Box_StartBoxTable (NULL,Txt_Data,NULL,
NULL,Box_NOT_CLOSABLE,2);
@ -2304,10 +2316,10 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
else
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save);
/* End form */
/* End data form */
Act_FormEnd ();
/***** End box *****/
/***** End project box *****/
Box_EndBox ();
}

83
swad_text.c
View File

@ -30999,6 +30999,89 @@ const char *Txt_Project_X_removed = // Warning: it is very important to include
"Projeto <strong>%s</strong> removido.";
#endif
const char *Txt_PROJECT_ROLES_SINGUL_Abc[Prj_NUM_ROLES_IN_PROJECT] =
{
#if L==1 // Prj_ROLE_UNK
"Desconegut/da"
#elif L==2
"Unbekannter/e"
#elif L==3
"Unknown"
#elif L==4
"Desconocido/a"
#elif L==5
"Inconnu/e"
#elif L==6
"Desconocido/a" // Okoteve traducción
#elif L==7
"Sconosciuto/a"
#elif L==8
"Nieznany"
#elif L==9
"Desconhecido/a"
#endif
,
#if L==1 // Prj_ROLE_STD
"Estudiant"
#elif L==2
"Student"
#elif L==3
"Student"
#elif L==4
"Estudiante"
#elif L==5
"&Eacute;tudiant/e"
#elif L==6
"Temimbo'e"
#elif L==7
"Studente"
#elif L==8
"Student"
#elif L==9
"Estudante"
#endif
,
#if L==1 // Prj_ROLE_TUT
"Tutor"
#elif L==2
"Tutor"
#elif L==3
"Tutor"
#elif L==4
"Tutor"
#elif L==5
"Tuteur"
#elif L==6
"Tutor" // Okoteve traducción
#elif L==7
"Precettore"
#elif L==8
"Nauczyciel"
#elif L==9
"Tutor"
#endif
,
#if L==1 // Prj_ROLE_EVA
"Avaluador"
#elif L==2
"Auswerter"
#elif L==3
"Evaluator"
#elif L==4
"Evaluador"
#elif L==5
"&Eacute;valuateur"
#elif L==6
"Evaluador" // Okoteve traducción
#elif L==7
"Valutatore"
#elif L==8
"Ewaluator"
#elif L==9
"Avaliador"
#endif
};
const char *Txt_PROJECT_ROLES_SINGUL_abc[Prj_NUM_ROLES_IN_PROJECT] =
{
#if L==1 // Prj_ROLE_UNK