X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=htdocs%2Fjavascript%2Fprofile.js;h=97de16714c01f1356a05ec052da1f52ff5f995fe;hb=bd803525db63a497d3b1b5ee90e5b560e9fc60f1;hp=2c5291c3e0f0444a13c64f049e898e5361a23df2;hpb=e8a7cf31258ca08662a91f7db64f17d056d8a6a4;p=platal.git
diff --git a/htdocs/javascript/profile.js b/htdocs/javascript/profile.js
index 2c5291c..97de167 100644
--- a/htdocs/javascript/profile.js
+++ b/htdocs/javascript/profile.js
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2003-2010 Polytechnique.org *
+ * Copyright (C) 2003-2011 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -37,18 +37,15 @@ function wizPage_onLoad(id)
updateGroupSubLink();
break;
case 'deco':
- for (var i in names) {
- if ($('#medal_' + i).length != 0) {
- getMedalName(i);
- buildGrade(i, $('#medal_' + i).find('[name*=medal_' + i + '_grade]').val());
- }
+ var i = 0;
+ while ($('#medal_' + i).length != 0) {
+ prepareMedal(i);
+ ++i;
}
break;
case 'emploi':
- for (var i = 0 ; $('#job_' + i).length != 0; ++i) {
- updateJobSector(i, $('#job_' + i).find("[name='jobs[" + i + "][subSector]']").val());
- updateJobSubSector(i, $('#job_' + i).find("[name='jobs[" + i + "][subSubSector]']").val());
- updateJobAlternates(i);
+ if ($('#jobs_0').find("[name='jobs[0][name]']").val() == '') {
+ registerEnterpriseAutocomplete(0);
}
break;
}
@@ -59,23 +56,33 @@ var educationDegreeAll;
var educationDegreeName;
var subgrades;
var names;
+var multiples;
+
+// Publicity follows the following ordering: private < ax < public.
+var publicity = [];
+publicity['private'] = 0;
+publicity['ax'] = 1;
+publicity['public'] = 2;
// Names {{{1
-function toggleNamesAdvanced()
+function toggleNamesAdvanced(togglePrivate)
{
- $('.names_advanced').toggle();
+ $('.names_advanced_public').toggle();
+ if (togglePrivate) {
+ $('.names_advanced_private').toggle();
+ }
}
-function addSearchName()
+function addSearchName(isFemale)
{
var i = 0;
while ($('#search_name_' + i).length != 0) {
i++;
}
- Ajax.update_html('search_name_' + i, 'profile/ajax/searchname/' + i, function(data){
- $('#searchname').before(data);
- changeNameFlag(i);
+ $('#search_name_' + i).updateHtml('profile/ajax/searchname/' + i + '/' + isFemale,
+ function(data) {
+ $('#searchname').before(data);
});
}
@@ -85,48 +92,35 @@ function removeSearchName(i, isFemale)
updateNameDisplay(isFemale);
}
-function changeNameFlag(i)
-{
- $('#flag_' + i).remove();
- var typeid = $('#search_name_' + i).find('select').val();
- var type = $('#search_name_' + i).find('select :selected').text();
- if ($('[name=sn_type_' + typeid + '_' + i + ']').val() > 0) {
- $('#flag_cb_' + i).after(' ' +
- '' +
- '' +
- '' +
- '');
- } else {
- $('#flag_cb_' + i).after(' ' +
- '
' +
- '' +
- '');
- }
-}
-
function updateNameDisplay(isFemale)
{
+ var lastnames = new Array('lastname_main', 'lastname_ordinary', 'lastname_marital', 'pseudonym');
+ var firstnames = new Array('firstname_main', 'firstname_ordinary');
var searchnames = '';
- for (var i = 0; i < 10; i++) {
- if ($('#search_name_' + i).find(':text').val()) {
- searchnames += $('#search_name_' + i).find('[name*=typeid]').val() + ';';
- searchnames += $('#search_name_' + i).find(':text').val() + ';;';
- }
+
+ for (var i = 0; i < 4; ++i) {
+ searchnames += $('.names_advanced').find('[name*=' + lastnames[i] + ']').val() + ';';
}
- Ajax.update_html(null, 'profile/ajax/buildnames/' + searchnames + '/' + isFemale, function(data){
- var name = data.split(';');
- $('#public_name').html(name[0]);
- $('#private_name').html(name[0] + name[1]);
- });
-}
+ searchnames += '-;'
+ for (var i = 0; i < 2; ++i) {
+ searchnames += $('.names_advanced').find('[name*=' + firstnames[i] + ']').val() + ';';
+ }
+ searchnames += '-';
-function toggleParticle(id)
-{
- if ($('#search_name_' + id).find("[name*='[particle]']").val() == '') {
- $('#search_name_' + id).find("[name*='[particle]']").val(1);
- } else {
- $('#search_name_' + id).find("[name*='[particle]']").val('');
+ var has_private = false;
+ for (var i = 0; i < 10; ++i) {
+ if ($('#search_name_' + i).find(':text').val()) {
+ searchnames += ';' + $('#search_name_' + i).find('[name*=type]').val() + ';' + $('#search_name_' + i).find(':text').val();
+ has_private = true;
+ }
}
+ searchnames += (has_private ? '' : ';');
+ $.xget('profile/ajax/buildnames/' + searchnames + '/' + isFemale,
+ function(data){
+ var name = data.split(';');
+ $('#public_name').html(name[0]);
+ $('#private_name').html(name[0] + name[1]);
+ });
}
// Promotions {{{1
@@ -140,19 +134,19 @@ function togglePromotionEdition()
function delNationality(i)
{
- $('#nationalite' + i).hide().find('select').val('');
+ $('#nationality' + i).hide().find('select').val('');
}
function addNationality()
{
var i = 0;
- if ($('#nationalite2').find('select').val() == "") {
+ if ($('#nationality2').find('select').val() == "") {
i = 2;
- } else if ($('#nationalite3').find('select').val() == "") {
+ } else if ($('#nationality3').find('select').val() == "") {
i = 3;
}
if ((i == 2) || (i == 3)) {
- $('#nationalite' + i).show();
+ $('#nationality' + i).show();
}
}
@@ -163,7 +157,11 @@ function prepareType(id)
var edu = $('.edu_' + id).find("[name='edus[" + id + "][eduid]']").val() - 1;
var sel = $('.edu_' + id).find('[name=edu_' + id + '_tmp]').val();
var html = '';
- var length = educationDegree[edu].length;
+ if (educationDegree[edu]) {
+ var length = educationDegree[edu].length;
+ } else {
+ var length = 0;
+ }
for (i = 0; i < length; ++i) {
html += '';
}
+ // XXX: to be removed once SQL table profile_merge_issues is.
+ if (sel != '' && html == '') {
+ html += '';
+ }
$('.edu_' + id).find("[name='edus[" + id + "][degreeid]']").html(html);
}
@@ -196,7 +198,7 @@ function addEdu()
i++;
$('#edu_add').addClass(prefix + i);
i--;
- $.get(platal_baseurl + 'profile/ajax/edu/' + i + '/' + class_parity,
+ $.xget('profile/ajax/edu/' + i + '/' + class_parity,
function(data) {
$('#edu_add').before(data);
prepareType(i);
@@ -262,6 +264,44 @@ function updateNetworking(i)
$('#networking_' + i).find("[name='networking[" + i + "][name]']").val($('#networking_' + i).find('select option:selected').text());
}
+// Hobby {{{1
+
+function addHobby()
+{
+ var i = 0;
+ while ($('#hobby_' + i).length != 0) {
+ ++i;
+ }
+ var html = '