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

This commit is contained in:
Antonio Cañas Vargas 2015-03-29 21:43:33 +02:00
parent 14cc570bf3
commit 2d191124e4
4 changed files with 63 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
swad_changelog.h
View File

@ -109,6 +109,7 @@
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/*
TODO: Show my course record card when I am a student and I click on record icon on the left of my record card?
Version 14.104.2: Mar 29, 2015 Changes in layout of record cards. (184042 lines)
Version 14.104.1: Mar 29, 2015 Changes in layout of record cards. (184039 lines)
Version 14.104: Mar 29, 2015 Changes in layout of record cards. (184021 lines)
Version 14.103: Mar 29, 2015 New table to ban users out of ranking. (184014 lines)

30
swad_enrollment.c
View File

@ -90,7 +90,6 @@ static void Enr_ShowFormRegRemSeveralUsrs (void);
static void Enr_PutLinkToRemOldUsrs (void);
static void Enr_PutAreaToEnterUsrsIDs (void);
static bool Enr_PutActionsRegRemOneUsr (bool ItsMe);
static void Enr_PutActionsRegRemSeveralUsrs (void);
static void Enr_RegisterUsr (struct UsrData *UsrDat,Rol_Role_t RegRemRole,
@ -798,7 +797,7 @@ static void Enr_PutAreaToEnterUsrsIDs (void)
/*****************************************************************************/
// Returns true if at least one action can be shown
static bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Modify_me_in_the_course_X;
@ -2851,12 +2850,8 @@ static void Enr_AskIfRegRemUsr (struct ListUsrCods *ListUsrCods)
static void Enr_ShowFormToEditOtherUsr (void)
{
extern const char *Txt_Confirm;
bool ItsMe = (Gbl.Usrs.Me.UsrDat.UsrCod == Gbl.Usrs.Other.UsrDat.UsrCod);
fprintf (Gbl.F.Out,"<div style=\"text-align:center; margin-bottom:20px;\">");
/***** Buttons for edition *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
if (Pwd_CheckIfICanChangeOtherUsrPassword (Gbl.Usrs.Other.UsrDat.UsrCod))
{
ID_PutLinkToChangeUsrIDs (&Gbl.Usrs.Other.UsrDat); // Put link (form) to change user's IDs
@ -2864,29 +2859,10 @@ static void Enr_ShowFormToEditOtherUsr (void)
}
if (Pho_CheckIfICanChangeOtherUsrPhoto (Gbl.Usrs.Other.UsrDat.UsrCod))
Pho_PutLinkToChangeUsrPhoto (&Gbl.Usrs.Other.UsrDat); // Put link (form) to change user's photo
fprintf (Gbl.F.Out,"</div>");
/***** User's record *****/
Rec_ShowSharedUsrRecord (Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR,&Gbl.Usrs.Other.UsrDat);
/***** Show list of groups to register/remove me/user *****/
if (Gbl.CurrentCrs.Grps.NumGrps) // This course has groups?
{
if (ItsMe)
{
// Don't show groups if I don't belong to course
if (Gbl.Usrs.Me.IBelongToCurrentCrs)
Grp_ShowLstGrpsToChgMyGrps ((Gbl.Usrs.Me.LoggedRole == Rol_ROLE_STUDENT));
}
else
Grp_ShowLstGrpsToChgOtherUsrsGrps (Gbl.Usrs.Other.UsrDat.UsrCod);
}
/***** Which action, register or removing? *****/
if (Enr_PutActionsRegRemOneUsr (ItsMe))
Lay_PutConfirmButton (Txt_Confirm);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/

2
swad_enrollment.h
View File

@ -91,6 +91,8 @@ void Enr_ReqAdminUsrs (void);
void Enr_AskRemoveOldUsrs (void);
void Enr_RemoveOldUsrs (void);
bool Enr_PutActionsRegRemOneUsr (bool ItsMe);
void Enr_ReceiveFormUsrsCrs (void);
void Enr_AskRemAllStdsThisCrs (void);
void Enr_RemAllStdsThisCrs (void);

95
swad_record.c
View File

@ -1945,18 +1945,8 @@ static void Rec_PutLinkToMyCrsRecord (void)
void Rec_ShowFormOtherNewCommonRecord (struct UsrData *UsrDat)
{
extern const char *Txt_Register;
/***** Show the form *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Rec_ShowSharedUsrRecord (Rec_FORM_NEW_RECORD_OTHER_NEW_USR,UsrDat);
if (Gbl.CurrentCrs.Grps.NumGrps) // This course has groups?
Grp_ShowLstGrpsToChgOtherUsrsGrps (UsrDat->UsrCod);
Lay_PutConfirmButton (Txt_Register);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/
@ -1971,9 +1961,7 @@ void Rec_ShowMyCommonRecordUpd (void)
Lay_ShowAlert (Lay_SUCCESS,Txt_Your_personal_data_have_been_updated);
/***** Show my record for checking *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Rec_ShowSharedUsrRecord (Rec_MY_COMMON_RECORD_CHECK,&Gbl.Usrs.Me.UsrDat);
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/
@ -2035,6 +2023,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
extern const char *Txt_Family_address;
extern const char *Txt_USER_comments;
extern const char *Txt_Save_changes;
extern const char *Txt_Register;
extern const char *Txt_Confirm;
unsigned RecordWidth;
unsigned TopC1Width;
unsigned TopC2Width;
@ -2120,40 +2110,25 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
{
case Rec_FORM_SIGN_UP:
case Rec_FORM_MY_COMMON_RECORD:
ClassHead = "HEAD_REC";
ClassForm = The_ClassFormul[Gbl.Prefs.Theme];
ClassData = "DAT_REC";
break;
case Rec_FORM_MY_COURSE_RECORD:
case Rec_FORM_NEW_RECORD_OTHER_NEW_USR:
ClassHead = "HEAD_REC";
ClassForm = The_ClassFormul[Gbl.Prefs.Theme];
ClassData = "DAT_REC";
Act_FormStart (ActCreOthUsrDat);
ID_PutParamOtherUsrIDPlain (); // New user
break;
case Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR:
ClassHead = "HEAD_REC";
ClassForm = The_ClassFormul[Gbl.Prefs.Theme];
ClassData = "DAT_REC";
Act_FormStart (ActUpdOthUsrDat);
Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); // Existing user
break;
case Rec_MY_COMMON_RECORD_CHECK:
case Rec_MY_COURSE_RECORD_CHECK:
case Rec_OTHER_USR_COMMON_RECORD_CHECK:
case Rec_OTHER_USR_COURSE_RECORD_CHECK:
case Rec_RECORD_LIST:
case Rec_RECORD_PUBLIC:
ClassHead = "HEAD_REC_SMALL";
ClassForm = "DAT_REC_SMALL";
ClassData = "DAT_REC_SMALL_BOLD";
break;
case Rec_RECORD_PRINT:
ClassHead = "HEAD_REC_SMALL";
ClassForm = "DAT_REC_SMALL";
ClassData = "DAT_REC_SMALL_BOLD";
break;
default:
break;
}
}
switch (TypeOfView)
{
@ -2492,8 +2467,22 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"3\">");
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
Act_FormStart (ActChgMyData);
switch (TypeOfView)
{
case Rec_FORM_MY_COMMON_RECORD:
Act_FormStart (ActChgMyData);
break;
case Rec_FORM_NEW_RECORD_OTHER_NEW_USR:
Act_FormStart (ActCreOthUsrDat);
ID_PutParamOtherUsrIDPlain (); // New user
break;
case Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR:
Act_FormStart (ActUpdOthUsrDat);
Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod); // Existing user
break;
default:
break;
}
fprintf (Gbl.F.Out,"<table style=\"width:100%%\">");
@ -3102,11 +3091,41 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
}
fprintf (Gbl.F.Out,"</table>");
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
{
Lay_PutConfirmButton (Txt_Save_changes);
Act_FormEnd ();
}
switch (TypeOfView)
{
case Rec_FORM_MY_COMMON_RECORD:
Lay_PutConfirmButton (Txt_Save_changes);
Act_FormEnd ();
break;
case Rec_FORM_NEW_RECORD_OTHER_NEW_USR:
if (Gbl.CurrentCrs.Grps.NumGrps) // This course has groups?
Grp_ShowLstGrpsToChgOtherUsrsGrps (UsrDat->UsrCod);
Lay_PutConfirmButton (Txt_Register);
Act_FormEnd ();
break;
case Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR:
/***** Show list of groups to register/remove me/user *****/
if (Gbl.CurrentCrs.Grps.NumGrps) // This course has groups?
{
if (ItsMe)
{
// Don't show groups if I don't belong to course
if (Gbl.Usrs.Me.IBelongToCurrentCrs)
Grp_ShowLstGrpsToChgMyGrps ((Gbl.Usrs.Me.LoggedRole == Rol_ROLE_STUDENT));
}
else
Grp_ShowLstGrpsToChgOtherUsrsGrps (UsrDat->UsrCod);
}
/***** Which action, register or removing? *****/
if (Enr_PutActionsRegRemOneUsr (ItsMe))
Lay_PutConfirmButton (Txt_Confirm);
Act_FormEnd ();
break;
default:
break;
}
fprintf (Gbl.F.Out,"</td>"
"</tr>");