mirror of https://github.com/acanas/swad-core.git
Version 16.81
This commit is contained in:
parent
d65891d528
commit
10424572c5
|
@ -2774,7 +2774,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
|
|||
/* ActFrmRolSes */{ 843, 1,TabPrf,ActFrmRolSes ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Usr_WriteFormLogout ,"keyuser64x64.gif" },
|
||||
/* ActMyCrs */{ 987, 2,TabPrf,ActMyCrs ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Crs_ReqSelectOneOfMyCourses ,"mygroups64x64.gif" },
|
||||
/* ActSeeMyTT */{ 408, 3,TabPrf,ActSeeMyTT ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,TT_ShowClassTimeTable ,"clock64x64.gif" },
|
||||
/* ActSeeMyLoc */{1602, 5,TabPrf,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Loc_SeeLocations ,"date64x64.gif" },
|
||||
/* ActSeeMyLoc */{1602, 5,TabPrf,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_SeeEvents ,"date64x64.gif" },
|
||||
/* ActFrmMyAcc */{ 36, 6,TabPrf,ActFrmMyAcc ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Acc_ShowFormMyAccount ,"arroba64x64.gif" },
|
||||
/* ActReqEdiRecCom */{ 285, 7,TabPrf,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rec_ShowFormMySharedRecord ,"card64x64.gif" },
|
||||
/* ActEdiPrf */{ 673, 8,TabPrf,ActEdiPrf ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Pre_EditPrefs ,"heart64x64.gif" },
|
||||
|
@ -2791,14 +2791,14 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
|
|||
/* ActAnnSee */{1234,-1,TabUnk,ActFrmRolSes ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ann_MarkAnnouncementAsSeen ,NULL},
|
||||
/* ActChgMyRol */{ 589,-1,TabUnk,ActFrmRolSes ,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,Rol_ChangeMyRole ,Usr_ShowFormsLogoutAndRole ,NULL},
|
||||
|
||||
/* ActFrmNewLoc */{1603,-1,TabUnk,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Loc_RequestCreatOrEditLoc ,NULL},
|
||||
/* ActEdiOneLoc */{1604,-1,TabUnk,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Loc_RequestCreatOrEditLoc ,NULL},
|
||||
/* ActNewLoc */{1605,-1,TabUnk,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Loc_RecFormLocation ,NULL},
|
||||
/* ActChgLoc */{1606,-1,TabUnk,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Loc_RecFormLocation ,NULL},
|
||||
/* ActReqRemLoc */{1607,-1,TabUnk,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Loc_AskRemLocation ,NULL},
|
||||
/* ActRemLoc */{1608,-1,TabUnk,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Loc_RemoveLocation ,NULL},
|
||||
/* ActHidLoc */{1609,-1,TabUnk,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Loc_HideLocation ,NULL},
|
||||
/* ActShoLoc */{1610,-1,TabUnk,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Loc_ShowLocation ,NULL},
|
||||
/* ActFrmNewLoc */{1603,-1,TabUnk,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_RequestCreatOrEditEvent ,NULL},
|
||||
/* ActEdiOneLoc */{1604,-1,TabUnk,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_RequestCreatOrEditEvent ,NULL},
|
||||
/* ActNewLoc */{1605,-1,TabUnk,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_RecFormEvent ,NULL},
|
||||
/* ActChgLoc */{1606,-1,TabUnk,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_RecFormEvent ,NULL},
|
||||
/* ActReqRemLoc */{1607,-1,TabUnk,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_AskRemEvent ,NULL},
|
||||
/* ActRemLoc */{1608,-1,TabUnk,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_RemoveEvent ,NULL},
|
||||
/* ActHidLoc */{1609,-1,TabUnk,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_HideEvent ,NULL},
|
||||
/* ActShoLoc */{1610,-1,TabUnk,ActSeeMyLoc ,0x100,0x100,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowEvent ,NULL},
|
||||
|
||||
/* ActChkUsrAcc */{1584,-1,TabUnk,ActFrmMyAcc ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Acc_CheckIfEmptyAccountExists ,NULL},
|
||||
/* ActCreUsrAcc */{1163,-1,TabUnk,ActFrmMyAcc ,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Acc_AfterCreationNewAccount ,NULL},
|
||||
|
|
744
swad_agenda.c
744
swad_agenda.c
File diff suppressed because it is too large
Load Diff
|
@ -53,15 +53,15 @@ typedef enum
|
|||
Loc_END_TIME = 1,
|
||||
} Loc_StartOrEndTime_t;
|
||||
|
||||
struct Location
|
||||
struct AgendaEvent
|
||||
{
|
||||
long LocCod;
|
||||
long AgdCod;
|
||||
bool Hidden;
|
||||
long UsrCod;
|
||||
time_t TimeUTC[Loc_NUM_DATES];
|
||||
bool Open;
|
||||
char Location[Loc_MAX_LENGTH_LOCATION+1];
|
||||
char Event[Loc_MAX_LENGTH_EVENT+1];
|
||||
char Location[Loc_MAX_LENGTH_LOCATION+1];
|
||||
};
|
||||
|
||||
typedef enum
|
||||
|
@ -76,23 +76,23 @@ typedef enum
|
|||
/***************************** Public prototypes *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
void Loc_SeeLocations (void);
|
||||
void Loc_PutHiddenParamLocOrderType (void);
|
||||
void Loc_RequestCreatOrEditLoc (void);
|
||||
void Loc_GetListLocations (void);
|
||||
void Loc_GetDataOfLocationByCod (struct Location *Loc);
|
||||
void Loc_FreeListLocations (void);
|
||||
void Agd_SeeEvents (void);
|
||||
void Agd_PutHiddenParamEventsOrderType (void);
|
||||
void Agd_RequestCreatOrEditEvent (void);
|
||||
void Agd_GetListEvents (void);
|
||||
void Agd_GetDataOfEventByCod (struct AgendaEvent *AgdEvent);
|
||||
void Agd_FreeListEvents (void);
|
||||
|
||||
long Loc_GetParamLocCod (void);
|
||||
void Loc_AskRemLocation (void);
|
||||
void Loc_RemoveLocation (void);
|
||||
void Loc_HideLocation (void);
|
||||
void Loc_ShowLocation (void);
|
||||
void Loc_RecFormLocation (void);
|
||||
void Loc_RemoveUsrLocations (long UsrCod);
|
||||
unsigned Loc_GetNumLocationsFromUsr (long UsrCod);
|
||||
long Agd_GetParamAgdCod (void);
|
||||
void Agd_AskRemEvent (void);
|
||||
void Agd_RemoveEvent (void);
|
||||
void Agd_HideEvent (void);
|
||||
void Agd_ShowEvent (void);
|
||||
void Agd_RecFormEvent (void);
|
||||
void Agd_RemoveUsrEvents (long UsrCod);
|
||||
unsigned Agd_GetNumEventsFromUsr (long UsrCod);
|
||||
|
||||
unsigned Loc_GetNumUsrsWithLocations (Sco_Scope_t Scope);
|
||||
unsigned Loc_GetNumLocations (Sco_Scope_t Scope);
|
||||
unsigned Agd_GetNumUsrsWithEvents (Sco_Scope_t Scope);
|
||||
unsigned Agd_GetNumEvents (Sco_Scope_t Scope);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -183,13 +183,15 @@
|
|||
/****************************** Public constants *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#define Log_PLATFORM_VERSION "SWAD 16.80.1 (2016-11-30)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 16.81 (2016-12-01)"
|
||||
#define CSS_FILE "swad16.69.css"
|
||||
#define JS_FILE "swad16.46.1.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.81: Dec 01, 2016 Code refactoring in agenda.
|
||||
Removed unused texts. (209182 lines)
|
||||
Version 16.80.1: Nov 30, 2016 Changed order of event and location in agenda.
|
||||
Removed unused texts. (209320 lines)
|
||||
Version 16.80: Nov 30, 2016 Changed location to agenda. (209428 lines)
|
||||
|
|
|
@ -227,9 +227,9 @@ const char *Hlp_PROFILE_Courses = WIKI "PROFILE.Courses";
|
|||
|
||||
const char *Hlp_PROFILE_Timetable = WIKI "PROFILE.Timetable";
|
||||
|
||||
const char *Hlp_PROFILE_Location = WIKI "PROFILE.Location";
|
||||
const char *Hlp_PROFILE_Location_new_location = WIKI "PROFILE.Location#new-location";
|
||||
const char *Hlp_PROFILE_Location_edit_location = WIKI "PROFILE.Location#edit-location";
|
||||
const char *Hlp_PROFILE_Agenda = WIKI "PROFILE.Agenda";
|
||||
const char *Hlp_PROFILE_Agenda_new_event = WIKI "PROFILE.Agenda#new-event";
|
||||
const char *Hlp_PROFILE_Agenda_edit_event = WIKI "PROFILE.Agenda#edit-event";
|
||||
|
||||
const char *Hlp_PROFILE_Record = WIKI "PROFILE.Record";
|
||||
const char *Hlp_PROFILE_Institution = WIKI "PROFILE.Institution";
|
||||
|
|
147
swad_text.c
147
swad_text.c
|
@ -2342,27 +2342,6 @@ const char *Txt_Alphabetic_BR_code_BR_ISO_3166_1 =
|
|||
"Cód.<br />alfabético<br />ISO 3166-1";
|
||||
#endif
|
||||
|
||||
const char *Txt_Already_existed_a_location_with_the_title_X = // Warning: it is very important to include %s in the following sentences
|
||||
#if L==1
|
||||
"Ja existia una ubicació amb el títol <strong>%s</strong>.";
|
||||
#elif L==2
|
||||
"Es gibt bereits einen Standort mit dem Namen <strong>%s</strong>.";
|
||||
#elif L==3
|
||||
"Already existed a location with the title <strong>%s</strong>.";
|
||||
#elif L==4
|
||||
"Ya existía una ubicación con el título <strong>%s</strong>.";
|
||||
#elif L==5
|
||||
"Il existe déjà un emplacement du titre <strong>%s</strong>.";
|
||||
#elif L==6
|
||||
"Ya existía una ubicación con el título <strong>%s</strong>."; // Okoteve traducción
|
||||
#elif L==7
|
||||
"Esiste già una posizione con il titolo <strong>%s</strong>.";
|
||||
#elif L==8
|
||||
"Istniala juz lokalizację z tytulu <strong>%s</strong>.";
|
||||
#elif L==9
|
||||
"Já existe uma localização com o título <strong>%s</strong>.";
|
||||
#endif
|
||||
|
||||
const char *Txt_Already_existed_an_assignment_with_the_folder_X = // Warning: it is very important to include %s in the following sentences
|
||||
#if L==1
|
||||
"Ja existia una activitat amb la carpeta <strong>%s</strong>.";
|
||||
|
@ -6863,27 +6842,6 @@ const char *Txt_Created_new_link_X = // Warning: it is very important to include
|
|||
"Criado nova ligação <strong>%s</strong>.";
|
||||
#endif
|
||||
|
||||
const char *Txt_Created_new_location_X = // Warning: it is very important to include %s in the following sentences
|
||||
#if L==1
|
||||
"Creada nova ubicació <strong>%s</strong>.";
|
||||
#elif L==2
|
||||
"Neuer Standort <strong>%s</strong> eingegeben.";
|
||||
#elif L==3
|
||||
"Created new location <strong>%s</strong>.";
|
||||
#elif L==4
|
||||
"Creada nueva ubicación <strong>%s</strong>.";
|
||||
#elif L==5
|
||||
"Créé nouvel emplacement <strong>%s</strong>.";
|
||||
#elif L==6
|
||||
"Creada nueva ubicación <strong>%s</strong>."; // Okoteve traducción
|
||||
#elif L==7
|
||||
"Creata nuova posizione <strong>%s</strong>.";
|
||||
#elif L==8
|
||||
"Utworzono nowe lokacja <strong>%s</strong>.";
|
||||
#elif L==9
|
||||
"Criado nova localização <strong>%s</strong>.";
|
||||
#endif
|
||||
|
||||
const char *Txt_Created_new_place_X = // Warning: it is very important to include %s in the following sentences
|
||||
#if L==1
|
||||
"Creado nuevo lugar <strong>%s</strong>."; // Necessita traduccio
|
||||
|
@ -9193,27 +9151,6 @@ const char *Txt_Do_you_really_want_to_remove_the_group_X_Y_students_ = // Warnin
|
|||
"Doing so will remove %u students from that group."; // Necessita de tradução
|
||||
#endif
|
||||
|
||||
const char *Txt_Do_you_really_want_to_remove_the_location_X = // Warning: it is very important to include %s in the following sentences
|
||||
#if L==1
|
||||
"¿De veres voleu eliminar la ubicació <strong>%s</strong>?";
|
||||
#elif L==2
|
||||
"Wollen Sie die Standort <strong>%s</strong> wirklich entfernen?";
|
||||
#elif L==3
|
||||
"Do you really want to remove the location <strong>%s</strong>?";
|
||||
#elif L==4
|
||||
"¿Realmente desea eliminar la ubicación <strong>%s</strong>?";
|
||||
#elif L==5
|
||||
"Voulez-vous vraiment supprimer l'emplacement <strong>%s</strong>?";
|
||||
#elif L==6
|
||||
"¿Realmente desea eliminar la ubicación <strong>%s</strong>?"; // Okoteve traducción
|
||||
#elif L==7
|
||||
"Vuoi realmente rimuovere la posizione <strong>%s</strong>?";
|
||||
#elif L==8
|
||||
"Czy na pewno chcesz usunac lokacja <strong>%s</strong>?";
|
||||
#elif L==9
|
||||
"Você realmente deseja remover a localização <strong>%s</strong>?";
|
||||
#endif
|
||||
|
||||
const char *Txt_Do_you_really_want_to_remove_the_photo_of_X = // Warning: it is very important to include %s in the following sentences
|
||||
#if L==1
|
||||
"De veres voleu eliminar la foto de <strong>%s</strong>?";
|
||||
|
@ -9862,27 +9799,6 @@ const char *Txt_Edit_event =
|
|||
"Editar evento";
|
||||
#endif
|
||||
|
||||
const char *Txt_Edit_location =
|
||||
#if L==1
|
||||
"Editar ubicació";
|
||||
#elif L==2
|
||||
"Aufgabe Standort";
|
||||
#elif L==3
|
||||
"Edit location";
|
||||
#elif L==4
|
||||
"Editar ubicación";
|
||||
#elif L==5
|
||||
"Éditer emplacement";
|
||||
#elif L==6
|
||||
"Editar ubicación"; // Okoteve traducción
|
||||
#elif L==7
|
||||
"Editare posizione";
|
||||
#elif L==8
|
||||
"Edytuj lokacja";
|
||||
#elif L==9
|
||||
"Editar localização";
|
||||
#endif
|
||||
|
||||
const char *Txt_Edit_my_institution =
|
||||
#if L==1
|
||||
"Edita la meva institució";
|
||||
|
@ -24572,27 +24488,6 @@ const char *Txt_No_institutions =
|
|||
"Não há instituções.";
|
||||
#endif
|
||||
|
||||
const char *Txt_No_locations =
|
||||
#if L==1
|
||||
"No hi ha ubicacions.";
|
||||
#elif L==2
|
||||
"Es gibt keine Standorte.";
|
||||
#elif L==3
|
||||
"No locations.";
|
||||
#elif L==4
|
||||
"No existen ubicaciones.";
|
||||
#elif L==5
|
||||
"Il n'y a pas d'emplacements.";
|
||||
#elif L==6
|
||||
"No existen ubicaciones."; // Okoteve traducción
|
||||
#elif L==7
|
||||
"Non ci sono posizioni.";
|
||||
#elif L==8
|
||||
"Brak lokalizacje.";
|
||||
#elif L==9
|
||||
"Não existem localizações.";
|
||||
#endif
|
||||
|
||||
const char *Txt_No_BR_msgs =
|
||||
#if L==1
|
||||
"Nº<br />mens."; // Necessita traduccio
|
||||
|
@ -30808,27 +30703,6 @@ const char *Txt_Remove_link =
|
|||
"Remover ligação";
|
||||
#endif
|
||||
|
||||
const char *Txt_Remove_location =
|
||||
#if L==1
|
||||
"Eliminar ubicació";
|
||||
#elif L==2
|
||||
"Entfernen Standort";
|
||||
#elif L==3
|
||||
"Remove location";
|
||||
#elif L==4
|
||||
"Eliminar ubicación";
|
||||
#elif L==5
|
||||
"Supprimer emplacement";
|
||||
#elif L==6
|
||||
"Eliminar ubicación"; // Okoteve traducción
|
||||
#elif L==7
|
||||
"Rimuovere posizione";
|
||||
#elif L==8
|
||||
"Usuń lokacja";
|
||||
#elif L==9
|
||||
"Remover localização";
|
||||
#endif
|
||||
|
||||
const char *Txt_Remove_logo =
|
||||
#if L==1
|
||||
"Eliminar logo";
|
||||
|
@ -54341,27 +54215,6 @@ const char *Txt_You_must_specify_the_title_of_the_event =
|
|||
"Você deve especificar o título do evento.";
|
||||
#endif
|
||||
|
||||
const char *Txt_You_must_specify_the_title_of_the_location =
|
||||
#if L==1
|
||||
"Cal especificar el títol de la ubicació.";
|
||||
#elif L==2
|
||||
"Sie müssen den Titel des Standorts angeben.";
|
||||
#elif L==3
|
||||
"You must specify the title of the location.";
|
||||
#elif L==4
|
||||
"Debe especificar el título de la ubicación.";
|
||||
#elif L==5
|
||||
"Vous devez spécifier le titre du emplacement.";
|
||||
#elif L==6
|
||||
"Debe especificar el título de la ubicación."; // Okoteve traducción
|
||||
#elif L==7
|
||||
"È necessario specificare il titolo della posizione.";
|
||||
#elif L==8
|
||||
"Musisz podać tytuł lokalizacji.";
|
||||
#elif L==9
|
||||
"Você deve especificar o título da localização.";
|
||||
#endif
|
||||
|
||||
const char *Txt_You_must_specify_the_title_of_the_survey =
|
||||
#if L==1
|
||||
"Debe especificar el título de la encuesta."; // Necessita traduccio
|
||||
|
|
Loading…
Reference in New Issue