X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=htdocs%2Fjavascript%2Fprofile.js;h=97de16714c01f1356a05ec052da1f52ff5f995fe;hb=821198c7f5394839f6421c54a32ae2a0dca19b3d;hp=ef2c7efbee8e92a66aed144e173cc814d43a335a;hpb=f31c2a2484c122c1ed4928cb9d461917069e4418;p=platal.git
diff --git a/htdocs/javascript/profile.js b/htdocs/javascript/profile.js
index ef2c7ef..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,15 +37,14 @@ 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':
- if ($('#job_0').find("[name='jobs[0][name]']").val() == '') {
+ if ($('#jobs_0').find("[name='jobs[0][name]']").val() == '') {
registerEnterpriseAutocomplete(0);
}
break;
@@ -57,12 +56,22 @@ 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(isFemale)
@@ -71,9 +80,9 @@ function addSearchName(isFemale)
while ($('#search_name_' + i).length != 0) {
i++;
}
- Ajax.update_html('search_name_' + i, 'profile/ajax/searchname/' + i + '/' + isFemale, function(data){
- $('#searchname').before(data);
- changeNameFlag(i);
+ $('#search_name_' + i).updateHtml('profile/ajax/searchname/' + i + '/' + isFemale,
+ function(data) {
+ $('#searchname').before(data);
});
}
@@ -83,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
@@ -161,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);
}
@@ -194,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);
@@ -260,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 = '
'
+ + ' '
+ + ' '
+ + ' '
+ + ' '
+ + ' '
+ + ' '
+ + ' '
+ + ' '
+ + ' '
+ + ' | '
+ + '
';
+
+ $('#hobby').before(html);
+}
+
+function removeHobby(id)
+{
+ $('#hobby_' + id).remove();
+}
+
// Addresses {{{1
function toggleAddress(id, val)
@@ -300,39 +342,51 @@ function checkCurrentAddress(id)
}
}
-function addAddress()
+function addAddress(pid)
{
var i = 0;
while ($('#addresses_' + i + '_cont').length != 0) {
i++;
}
$('#add_address').before('');
- Ajax.update_html('addresses_' + i + '_cont', 'profile/ajax/address/' + i, checkCurrentAddress());
+ $('#addresses_' + i + '_cont').updateHtml('profile/ajax/address/' + i + '/' + pid,
+ checkCurrentAddress());
}
-function addressChanged(prefid)
+function addressChanged(prefid, color)
{
+ var text = $('#' + prefid + '_cont').find("[name*='[text]']").val();
$('#' + prefid + '_cont').find('[name*=changed]').val("1");
+ $.xpost('map_url/', { text:text, color:color }, function(data) {
+ if (data) {
+ $('#' + prefid + '_static_map_url').show();
+ $('#' + prefid + '_static_map_url').find('img').attr('src', data);
+ } else {
+ $('#' + prefid + '_static_map_url').hide();
+ $('#' + prefid + '_geocoding_removal').find('[name*=request]:checkbox').removeAttr('checked');
+ }
+ });
}
-function validGeoloc(prefid, id, geoloc)
+function deleteGeocoding(prefid)
{
- if (geoloc == 1) {
- $('#' + prefid + '_cont').find('[name*=text]').val($('#' + prefid + '_cont').find('[name*=geocodedText]').val());
- $('#' + prefid + '_cont').find('[name*=postalText]').val($('#' + prefid + '_cont').find('[name*=geocodedPostalText]').val());
- }
- if (geoloc > 0) {
- $('#' + prefid + '_cont').find("[name*='[geocodedText]']").remove();
- $('#' + prefid + '_cont').find("[name*='[geocodedPostalText]']").remove();
+ if($('#' + prefid + '_geocoding_removal').find('[name*=request]:checkbox:checked').length == 0) {
+ return true;
}
- $('#' + prefid + '_cont').find('[name*=text]').removeClass('error');
- $('#' + prefid + '_cont').find('[name*=geocodeChosen]').val(geoloc);
- $('.' + prefid + '_geoloc').remove();
+
+ return confirm(
+ "La localisation de l'adresse sert à deux choses : te placer dans "
+ + "le planisphère et te faire apparaître dans la recherche avancée par "
+ + "pays, région, département, ville... La supprimer t'en fera disparaître. "
+ + "\nIl ne faut le faire que si cette localisation "
+ + "est réellement erronée. Avant de supprimer cette localisation, l'équipe de "
+ + "Polytechnique.org tentera de la réparer.\n\nConfirmes-tu ta "
+ + "demande de suppression de cette localisation ?");
}
// {{{1 Phones
-function addTel(prefid, prefname)
+function addTel(prefid, prefname, subField, mainField, mainId)
{
var i = 0;
var prefix = prefid + '_';
@@ -340,7 +394,7 @@ function addTel(prefid, prefname)
i++;
}
$('#' + prefix + 'add').before('');
- Ajax.update_html(prefix + i, 'profile/ajax/tel/' + prefid + '/' + prefname + '/' + i);
+ $('#' + prefix + i).updateHtml('profile/ajax/tel/' + prefid + '/' + prefname + '/' + i + '/' + subField + '/' + mainField + '/' + mainId);
}
function removeTel(prefname, prefid, id)
@@ -420,10 +474,17 @@ function updateGroupSubLink()
// {{{1 Medals
+function prepareMedal(i)
+{
+ getMedalName($('#medal_' + i).find('[name="medals[' + i + '][id]"]').val());
+ buildGrade(i);
+}
+
function updateMedal()
{
var val = $('#medals').find('[name*=medal_sel]').val();
- if (val && ($('#medal_' + val).length == 0)) {
+
+ if ((multiple[val] && subgrades[val]) || $('.medal_name_' + val).length == 0) {
$('#medal_add').show();
} else {
$('#medal_add').hide();
@@ -432,55 +493,80 @@ function updateMedal()
function getMedalName(id)
{
- $('#medal_name_' + id).html(names[id]);
+ $('.medal_name_' + id).html(names[id]);
}
-function buildGrade(id, current)
+function buildGrade(i)
{
- var grade;
- var subg = subgrades[id];
- var obj = $('#medal_grade_' + id);
+ var id = $('#medal_' + i).find('[name="medals[' + i + '][id]"]').val();
+ var current = $('#medal_' + i).find('[name="medals_' + i + '_grade"]').val();
+ var subg = subgrades[id];
+ var obj = $('#medal_grade_' + i);
if (!subg) {
- obj.prepend('');
+ obj.prepend('');
} else {
- var html = 'Agrafe :