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 14.107.3

This commit is contained in:
Antonio Cañas Vargas 2015-04-02 19:25:44 +02:00
parent 41db073b85
commit d4c7f076bc
4 changed files with 34 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
swad_assignment.c
View File

@ -1129,7 +1129,7 @@ void Asg_RequestCreatOrEditAsg (void)
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<input type=\"text\" name=\"Title\" size=\"80\" maxlength=\"%u\" value=\"%s\" />"
"<input type=\"text\" name=\"Title\" size=\"45\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Title,
@ -1249,7 +1249,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">",
Txt_Groups);
Lay_StartRoundFrameTable10 (NULL,0,NULL);
Lay_StartRoundFrameTable10 ("100%",0,NULL);
/***** First row: checkbox to select the whole course *****/
fprintf (Gbl.F.Out,"<tr>"
@ -1722,14 +1722,24 @@ static bool Asg_CheckIfICanDoThisAssignment (long AsgCod)
{
char Query[512];
/***** Get if I can do an assignment from database *****/
sprintf (Query,"SELECT COUNT(*) FROM assignments"
" WHERE AsgCod='%ld'"
" AND (AsgCod NOT IN (SELECT AsgCod FROM asg_grp) OR"
" AsgCod IN (SELECT asg_grp.AsgCod FROM asg_grp,crs_grp_usr"
" WHERE crs_grp_usr.UsrCod='%ld' AND asg_grp.GrpCod=crs_grp_usr.GrpCod))",
AsgCod,Gbl.Usrs.Me.UsrDat.UsrCod);
return (DB_QueryCOUNT (Query,"can not check if I can do an assignment") != 0);
if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_STUDENT)
{
/***** Get if I can do an assignment from database *****/
sprintf (Query,"SELECT COUNT(*) FROM assignments"
" WHERE AsgCod='%ld'"
" AND ("
"AsgCod NOT IN (SELECT AsgCod FROM asg_grp)"
" OR "
"AsgCod IN"
" (SELECT asg_grp.AsgCod FROM asg_grp,crs_grp_usr"
" WHERE crs_grp_usr.UsrCod='%ld'"
" AND asg_grp.GrpCod=crs_grp_usr.GrpCod)"
")",
AsgCod,Gbl.Usrs.Me.UsrDat.UsrCod);
return (DB_QueryCOUNT (Query,"can not check if I can do an assignment") != 0);
}
else
return false;
}
/*****************************************************************************/

45
swad_attendance.c
View File

@ -496,25 +496,17 @@ static void Att_PutFormsToRemEditOneAttEvent (long AttCod,bool Hidden)
extern const char *Txt_Hide;
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div style=\"padding:5px 0;\">");
/***** Put form to remove attendance event *****/
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_4\">"
"<tr>"
"<td style=\"text-align:left;\">");
Act_FormStart (ActReqRemAtt);
Att_PutParamAttCod (AttCod);
Att_PutHiddenParamAttOrderType ();
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/delon16x16.gif\""
" alt=\"%s\" title=\"%s\" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,
Txt_Remove,
Txt_Remove);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>");
Act_PutIconLink ("delon",Txt_Remove);
/***** Put form to hide/show attendance event *****/
fprintf (Gbl.F.Out,"<td style=\"text-align:left;\">");
Act_FormStart (Hidden ? ActShoAtt :
ActHidAtt);
Att_PutParamAttCod (AttCod);
@ -522,36 +514,19 @@ static void Att_PutFormsToRemEditOneAttEvent (long AttCod,bool Hidden)
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
if (Hidden)
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/hidden_on16x16.gif\""
" alt=\"%s\" title=\"%s\" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,
Txt_Show,
Txt_Show);
Act_PutIconLink ("hidden_on",Txt_Show);
else
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/visible_on16x16.gif\""
" alt=\"%s\" title=\"%s\" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,
Txt_Hide,
Txt_Hide);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>");
Act_PutIconLink ("visible_on",Txt_Hide);
/***** Put form to edit attendance event *****/
fprintf (Gbl.F.Out,"<td style=\"text-align:left;\">");
Act_FormStart (ActEdiOneAtt);
Att_PutParamAttCod (AttCod);
Att_PutHiddenParamAttOrderType ();
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/edit16x16.gif\""
" alt=\"%s\" title=\"%s\" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,
Txt_Edit,
Txt_Edit);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>"
"</table>");
Act_PutIconLink ("edit",Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/
@ -1121,7 +1096,7 @@ void Att_RequestCreatOrEditAttEvent (void)
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<input type=\"text\" name=\"Title\" size=\"80\" maxlength=\"%u\" value=\"%s\" />"
"<input type=\"text\" name=\"Title\" size=\"45\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Title,
@ -1249,7 +1224,7 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">",
Txt_Groups);
Lay_StartRoundFrameTable10 (NULL,0,NULL);
Lay_StartRoundFrameTable10 ("100%",0,NULL);
/***** First row: checkbox to select the whole course *****/
fprintf (Gbl.F.Out,"<tr>"

4
swad_changelog.h
View File

@ -103,11 +103,13 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.107.2 (2015/04/02)"
#define Log_PLATFORM_VERSION "SWAD 14.107.3 (2015/04/02)"
// 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 14.107.3: Apr 02, 2015 Changes in icons in attendance events.
Fixed bug in assignments. (183702 lines)
Version 14.107.2: Apr 02, 2015 Changes in icons in surveys. (183717 lines)
Version 14.107.1: Apr 02, 2015 Changes in icons in assignments. (183748 lines)
Version 14.107: Apr 02, 2015 Refactoring contextual menus. (183776 lines)

2
swad_survey.c
View File

@ -1592,7 +1592,7 @@ void Svy_RequestCreatOrEditSvy (void)
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<input type=\"text\" name=\"Title\" size=\"40\" maxlength=\"%u\" value=\"%s\" />"
"<input type=\"text\" name=\"Title\" size=\"45\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Title,