lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add date of birth in candidatures

Browse Source
This commit is contained in:
Laurent Destailleur 2020-09-16 00:47:44 +02:00
parent 7bcf2c9089
commit 5c31593d43
12 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/adherents/card.php
View File

@ -942,7 +942,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
} }
// Birth Date // Birth Date
print "<tr><td>".$langs->trans("DateToBirth")."</td><td>\n"; print "<tr><td>".$langs->trans("DateOfBirth")."</td><td>\n";
print $form->selectDate(($object->birth ? $object->birth : -1), 'birth', '', '', 1, 'formsoc'); print $form->selectDate(($object->birth ? $object->birth : -1), 'birth', '', '', 1, 'formsoc');
print "</td></tr>\n"; print "</td></tr>\n";
@ -1175,7 +1175,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
} }
// Birth Date // Birth Date
print "<tr><td>".$langs->trans("DateToBirth")."</td><td>\n"; print "<tr><td>".$langs->trans("DateOfBirth")."</td><td>\n";
print $form->selectDate(($object->birth ? $object->birth : -1), 'birth', '', '', 1, 'formsoc'); print $form->selectDate(($object->birth ? $object->birth : -1), 'birth', '', '', 1, 'formsoc');
print "</td></tr>\n"; print "</td></tr>\n";
@ -1570,7 +1570,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '<table class="border tableforfield tableforfield" width="100%">'; print '<table class="border tableforfield tableforfield" width="100%">';
// Birth Date // Birth Date
print '<tr><td class="titlefield">'.$langs->trans("DateToBirth").'</td><td class="valeur">'.dol_print_date($object->birth, 'day').'</td></tr>'; print '<tr><td class="titlefield">'.$langs->trans("DateOfBirth").'</td><td class="valeur">'.dol_print_date($object->birth, 'day').'</td></tr>';
// Public // Public
print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>'; print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';

2
htdocs/adherents/class/adherent.class.php
View File

@ -282,7 +282,7 @@ class Adherent extends CommonObject
'phone' => array('type' => 'varchar(30)', 'label' => 'Phone', 'enabled' => 1, 'visible' => -1, 'position' => 115), 'phone' => array('type' => 'varchar(30)', 'label' => 'Phone', 'enabled' => 1, 'visible' => -1, 'position' => 115),
'phone_perso' => array('type' => 'varchar(30)', 'label' => 'Phone perso', 'enabled' => 1, 'visible' => -1, 'position' => 120), 'phone_perso' => array('type' => 'varchar(30)', 'label' => 'Phone perso', 'enabled' => 1, 'visible' => -1, 'position' => 120),
'phone_mobile' => array('type' => 'varchar(30)', 'label' => 'Phone mobile', 'enabled' => 1, 'visible' => -1, 'position' => 125), 'phone_mobile' => array('type' => 'varchar(30)', 'label' => 'Phone mobile', 'enabled' => 1, 'visible' => -1, 'position' => 125),
'birth' => array('type' => 'date', 'label' => 'DateToBirth', 'enabled' => 1, 'visible' => -1, 'position' => 130), 'birth' => array('type' => 'date', 'label' => 'DateOfBirth', 'enabled' => 1, 'visible' => -1, 'position' => 130),
'photo' => array('type' => 'varchar(255)', 'label' => 'Photo', 'enabled' => 1, 'visible' => -1, 'position' => 135), 'photo' => array('type' => 'varchar(255)', 'label' => 'Photo', 'enabled' => 1, 'visible' => -1, 'position' => 135),
'public' => array('type' => 'smallint(6)', 'label' => 'Public', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 145), 'public' => array('type' => 'smallint(6)', 'label' => 'Public', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 145),
'datefin' => array('type' => 'datetime', 'label' => 'DateEnd', 'enabled' => 1, 'visible' => -1, 'position' => 150), 'datefin' => array('type' => 'datetime', 'label' => 'DateEnd', 'enabled' => 1, 'visible' => -1, 'position' => 150),

2
htdocs/contact/card.php
View File

@ -851,7 +851,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
print '<table class="border centpercent">'; print '<table class="border centpercent">';
// Date To Birth // Date To Birth
print '<tr><td><label for="birthday">'.$langs->trans("DateToBirth").'</label></td><td>'; print '<tr><td><label for="birthday">'.$langs->trans("DateOfBirth").'</label></td><td>';
$form = new Form($db); $form = new Form($db);
if ($object->birthday) if ($object->birthday)
{ {

6
htdocs/contact/perso.php
View File

@ -188,7 +188,7 @@ if ($action == 'edit')
print '</td></tr>'; print '</td></tr>';
// Date To Birth // Date To Birth
print '<tr><td>'.$langs->trans("DateToBirth").'</td><td>'; print '<tr><td>'.$langs->trans("DateOfBirth").'</td><td>';
$form = new Form($db); $form = new Form($db);
print $form->selectDate($object->birthday, 'birthday', 0, 0, 1, "perso", 1, 0); print $form->selectDate($object->birthday, 'birthday', 0, 0, 1, "perso", 1, 0);
print '</td>'; print '</td>';
@ -272,7 +272,7 @@ if ($action == 'edit')
{ {
include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
print '<td>'.$langs->trans("DateToBirth").'</td><td colspan="3">'.dol_print_date($object->birthday, "day"); print '<td>'.$langs->trans("DateOfBirth").'</td><td colspan="3">'.dol_print_date($object->birthday, "day");
print ' &nbsp; '; print ' &nbsp; ';
//var_dump($birthdatearray); //var_dump($birthdatearray);
@ -288,7 +288,7 @@ if ($action == 'edit')
else print $langs->trans("BirthdayAlertOff"); else print $langs->trans("BirthdayAlertOff");
print '</td>'; print '</td>';
} else { } else {
print '<td>'.$langs->trans("DateToBirth").'</td><td colspan="3"></td>'; print '<td>'.$langs->trans("DateOfBirth").'</td><td colspan="3"></td>';
} }
print "</tr>"; print "</tr>";

2
htdocs/core/modules/modCategorie.class.php
View File

@ -275,7 +275,7 @@ class modCategorie extends DolibarrModules
'p.town' => 'Town', 'p.town' => 'Town',
'country.code' => 'CountryCode', 'country.code' => 'CountryCode',
'country.label' => 'Country', 'country.label' => 'Country',
'p.birthday' => 'DateToBirth', 'p.birthday' => 'DateOfBirth',
'p.poste' => 'PostOrFunction', 'p.poste' => 'PostOrFunction',
'p.phone' => 'Phone', 'p.phone' => 'Phone',
'p.phone_perso' => 'PhonePerso', 'p.phone_perso' => 'PhonePerso',

2
htdocs/core/modules/modSociete.class.php
View File

@ -632,7 +632,7 @@ class modSociete extends DolibarrModules
's.town' => "Town", 's.town' => "Town",
's.fk_departement' => "StateCode", 's.fk_departement' => "StateCode",
's.fk_pays' => "CountryCode", 's.fk_pays' => "CountryCode",
's.birthday' => "BirthdayDate", 's.birthday' => "DateOfBirth",
's.poste' => "Role", 's.poste' => "Role",
's.phone' => "Phone", 's.phone' => "Phone",
's.phone_perso' => "PhonePerso", 's.phone_perso' => "PhonePerso",

4
htdocs/core/modules/modUser.class.php
View File

@ -227,7 +227,7 @@ class modUser extends DolibarrModules
'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature', 'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature',
'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours', 'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours',
'u.dateemployment'=>'DateEmployment', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey', 'u.dateemployment'=>'DateEmployment', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey',
'u.birth'=>'BirthdayDate', 'u.birth'=>'DateOfBirth',
'u.datec'=>"DateCreation", 'u.tms'=>"DateLastModification", 'u.datec'=>"DateCreation", 'u.tms'=>"DateLastModification",
'u.admin'=>"Administrator", 'u.statut'=>'Status', 'u.datelastlogin'=>'LastConnexion', 'u.datepreviouslogin'=>'PreviousConnexion', 'u.admin'=>"Administrator", 'u.statut'=>'Status', 'u.datelastlogin'=>'LastConnexion', 'u.datepreviouslogin'=>'PreviousConnexion',
'u.fk_socpeople'=>"IdContact", 'u.fk_soc'=>"IdCompany", 'u.fk_member'=>"MemberId" 'u.fk_socpeople'=>"IdContact", 'u.fk_soc'=>"IdCompany", 'u.fk_member'=>"MemberId"
@ -283,7 +283,7 @@ class modUser extends DolibarrModules
'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature', 'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature',
'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours', 'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours',
'u.dateemployment'=>'DateEmployment', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey', 'u.dateemployment'=>'DateEmployment', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey',
'u.birth'=>'BirthdayDate', 'u.birth'=>'DateOfBirth',
'u.datec'=>"DateCreation", 'u.datec'=>"DateCreation",
'u.statut'=>'Status' 'u.statut'=>'Status'
); );

2
htdocs/install/mysql/migration/12.0.0-13.0.0.sql
View File

@ -176,6 +176,7 @@ CREATE TABLE llx_recruitment_recruitmentcandidature(
lastname varchar(128), lastname varchar(128),
email varchar(255), email varchar(255),
phone varchar(64), phone varchar(64),
date_birth date,
remuneration_requested integer, remuneration_requested integer,
remuneration_proposed integer, remuneration_proposed integer,
email_msgid varchar(255), email_msgid varchar(255),
@ -186,6 +187,7 @@ CREATE TABLE llx_recruitment_recruitmentcandidature(
ALTER TABLE llx_recruitment_recruitmentcandidature ADD COLUMN entity integer NOT NULL DEFAULT 1; ALTER TABLE llx_recruitment_recruitmentcandidature ADD COLUMN entity integer NOT NULL DEFAULT 1;
ALTER TABLE llx_recruitment_recruitmentcandidature ADD COLUMN email_msgid varchar(255); ALTER TABLE llx_recruitment_recruitmentcandidature ADD COLUMN email_msgid varchar(255);
ALTER TABLE llx_recruitment_recruitmentcandidature ADD COLUMN fk_recruitment_origin INTEGER NULL; ALTER TABLE llx_recruitment_recruitmentcandidature ADD COLUMN fk_recruitment_origin INTEGER NULL;
ALTER TABLE llx_recruitment_recruitmentcandidature ADD COLUMN date_birth date;
ALTER TABLE llx_recruitment_recruitmentcandidature ADD INDEX idx_recruitment_recruitmentcandidature_rowid (rowid); ALTER TABLE llx_recruitment_recruitmentcandidature ADD INDEX idx_recruitment_recruitmentcandidature_rowid (rowid);
ALTER TABLE llx_recruitment_recruitmentcandidature ADD INDEX idx_recruitment_recruitmentcandidature_ref (ref); ALTER TABLE llx_recruitment_recruitmentcandidature ADD INDEX idx_recruitment_recruitmentcandidature_ref (ref);

3
htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql
View File

@ -23,7 +23,7 @@ CREATE TABLE llx_recruitment_recruitmentcandidature(
description text, description text,
note_public text, note_public text,
note_private text, note_private text,
date_creation datetime NOT NULL, date_creation datetime NOT NULL,
tms timestamp, tms timestamp,
fk_user_creat integer NOT NULL, fk_user_creat integer NOT NULL,
fk_user_modif integer, fk_user_modif integer,
@ -34,6 +34,7 @@ CREATE TABLE llx_recruitment_recruitmentcandidature(
lastname varchar(128), lastname varchar(128),
email varchar(255), email varchar(255),
phone varchar(64), phone varchar(64),
date_birth date,
remuneration_requested integer, remuneration_requested integer,
remuneration_proposed integer, remuneration_proposed integer,
email_msgid varchar(255), email_msgid varchar(255),

1
htdocs/langs/en_US/main.lang
View File

@ -1090,3 +1090,4 @@ VALIDATEInDolibarr=Record %s validated
APPROVEDInDolibarr=Record %s approved APPROVEDInDolibarr=Record %s approved
DefaultMailModel=Default Mail Model DefaultMailModel=Default Mail Model
PublicVendorName=Public name of vendor PublicVendorName=Public name of vendor
DateOfBirth=Date of birth

2
htdocs/langs/en_US/other.lang
View File

@ -5,8 +5,6 @@ Tools=Tools
TMenuTools=Tools TMenuTools=Tools
ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu. ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
Birthday=Birthday Birthday=Birthday
BirthdayDate=Birthday date
DateToBirth=Birth date
BirthdayAlertOn=birthday alert active BirthdayAlertOn=birthday alert active
BirthdayAlertOff=birthday alert inactive BirthdayAlertOff=birthday alert inactive
TransKey=Translation of the key TransKey TransKey=Translation of the key TransKey

4
htdocs/recruitment/class/recruitmentcandidature.class.php
View File

@ -116,6 +116,7 @@ class RecruitmentCandidature extends CommonObject
'firstname' => array('type'=>'varchar(128)', 'label'=>'Firstname', 'enabled'=>'1', 'position'=>21, 'notnull'=>0, 'visible'=>1,), 'firstname' => array('type'=>'varchar(128)', 'label'=>'Firstname', 'enabled'=>'1', 'position'=>21, 'notnull'=>0, 'visible'=>1,),
'email' => array('type'=>'varchar(255)', 'label'=>'EMail', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1,), 'email' => array('type'=>'varchar(255)', 'label'=>'EMail', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1,),
'phone' => array('type'=>'varchar(64)', 'label'=>'Phone', 'enabled'=>'1', 'position'=>31, 'notnull'=>0, 'visible'=>1,), 'phone' => array('type'=>'varchar(64)', 'label'=>'Phone', 'enabled'=>'1', 'position'=>31, 'notnull'=>0, 'visible'=>1,),
'date_birth' => array('type'=>'date', 'label'=>'DateOfBirth', 'enabled'=>'1', 'position'=>70, 'visible'=>-1,),
'email_msgid' => array('type'=>'varchar(255)', 'label'=>'EmailMsgID', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'help'=>'EmailMsgIDDesc'), 'email_msgid' => array('type'=>'varchar(255)', 'label'=>'EmailMsgID', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'help'=>'EmailMsgIDDesc'),
//'fk_recruitment_origin' => array('type'=>'integer:CRecruitmentOrigin:recruitment/class/crecruitmentorigin.class.php', 'label'=>'Origin', 'enabled'=>'1', 'position'=>45, 'visible'=>1, 'index'=>1), //'fk_recruitment_origin' => array('type'=>'integer:CRecruitmentOrigin:recruitment/class/crecruitmentorigin.class.php', 'label'=>'Origin', 'enabled'=>'1', 'position'=>45, 'visible'=>1, 'index'=>1),
'remuneration_requested' => array('type'=>'integer', 'label'=>'RequestedRemuneration', 'enabled'=>'1', 'position'=>80, 'notnull'=>0, 'visible'=>-1,), 'remuneration_requested' => array('type'=>'integer', 'label'=>'RequestedRemuneration', 'enabled'=>'1', 'position'=>80, 'notnull'=>0, 'visible'=>-1,),
@ -140,9 +141,10 @@ class RecruitmentCandidature extends CommonObject
public $firstname; public $firstname;
public $email; public $email;
public $phone; public $phone;
public $date_birth;
public $email_msgid;
public $remuneration_requested; public $remuneration_requested;
public $remuneration_proposed; public $remuneration_proposed;
public $email_msgid;
public $fk_recruitment_origin; public $fk_recruitment_origin;
public $import_key; public $import_key;
public $model_pdf; public $model_pdf;