[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8336]
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [8336] |
|
Date: |
Fri, 16 Dec 2011 08:56:35 +0000 |
Revision: 8336
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8336
Author: erikhl
Date: 2011-12-16 08:56:34 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
trunk/activitycalendarfrontend/setup/phpgw_no.lang
trunk/activitycalendarfrontend/templates/base/activity_new.php
Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2011-12-15
18:42:12 UTC (rev 8335)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2011-12-16
08:56:34 UTC (rev 8336)
@@ -9,6 +9,7 @@
include_class('activitycalendar', 'activity', 'inc/model/');
include_class('activitycalendar', 'group', 'inc/model/');
include_class('activitycalendar', 'organization', 'inc/model/');
+ include_class('activitycalendar', 'arena', 'inc/model/');
class activitycalendarfrontend_uiactivity extends
activitycalendar_uiactivities
{
@@ -240,11 +241,28 @@
$desc = substr($desc,0,254);
}
+ $arena_id = phpgw::get_var('arena_id');
+ if($arena_id != null && $arena_id ==
'new_arena')
+ {
+ $arena = new activitycalendar_arena();
+ $arena_name =
phpgw::get_var('arena_name');
+ $arena_address =
phpgw::get_var('arena_address') . ' ' . phpgw::get_var('arena_number') . ', ' .
phpgw::get_var('arena_postaddress');
+
+ $arena->set_arena_name($arena_name);
+ $arena->set_address($arena_address);
+ $arena->set_active(true);
+
+ // All is good, store arena
+ if ($this->so_arena->store($arena)) {
+ $arena_id = $arena->get_id();
+ }
+ }
+
//... set all parameters
$activity->set_title(phpgw::get_var('title'));
$activity->set_organization_id($o_id);
$activity->set_group_id($g_id);
-
$activity->set_arena(phpgw::get_var('arena_id'));
+ $activity->set_arena($arena_id);
$activity->set_internal_arena(phpgw::get_var('internal_arena_id'));
$district_array = phpgw::get_var('district');
$activity->set_district(implode(",",
$district_array));
Modified: trunk/activitycalendarfrontend/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendarfrontend/setup/phpgw_no.lang 2011-12-15 18:42:12 UTC
(rev 8335)
+++ trunk/activitycalendarfrontend/setup/phpgw_no.lang 2011-12-16 08:56:34 UTC
(rev 8336)
@@ -69,7 +69,8 @@
what activitycalendarfrontend no HVA
where_when activitycalendarfrontend no HVOR/NÅR
who activitycalendarfrontend no HVEM
-arena_helptext activitycalendarfrontend no Oppgi arena ved å velge
kommunalt bygg eller eksterne bygg.
+arena_helptext activitycalendarfrontend no Oppgi arena ved å velge
kommunalt bygg eller eksterne bygg.<br/>Dersom ikke arena som skal benyttes
finnes i listen, kan du registrere en ny.<br/>Velg "Ny arena" i nedtrekksmenyen
for Eksterne bygg og oppgi deretter riktig navn og adresse på arenaen.
+new_arena activitycalendarfrontend no Ny Arena
external_arena activitycalendarfrontend no Eksterne bygg
category_helptext activitycalendarfrontend no Velg kategori
target_helptext activitycalendarfrontend no Velg
målgruppe(r)
@@ -88,4 +89,5 @@
edit_activity activitycalendarfrontend no Endre aktivitet
activity_edit_helptext activitycalendarfrontend no Velg
aktiviteten du ønsker å endre fra listen under.
send_change_request activitycalendarfrontend no Send inn
endringsønske
-edit_organization activitycalendarfrontend no Rediger
organisasjonsinformasjon
\ No newline at end of file
+edit_organization activitycalendarfrontend no Rediger
organisasjonsinformasjon
+address activitycalendarfrontend no Adresse
\ No newline at end of file
Modified: trunk/activitycalendarfrontend/templates/base/activity_new.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_new.php
2011-12-15 18:42:12 UTC (rev 8335)
+++ trunk/activitycalendarfrontend/templates/base/activity_new.php
2011-12-16 08:56:34 UTC (rev 8336)
@@ -20,6 +20,19 @@
}
}
+function checkNewArena()
+{
+ var arena_selected = document.getElementById('arena_id').value;
+ if(arena_selected == 'new_arena')
+ {
+ document.getElementById('new_arena_fields').style.display =
"block";
+ }
+ else
+ {
+ document.getElementById('new_arena_fields').style.display =
"none";
+ }
+}
+
function get_address_search()
{
var address = document.getElementById('address_txt').value;
@@ -42,6 +55,28 @@
}
+function get_address_search_arena()
+{
+ var address = document.getElementById('arena_address_txt').value;
+ var div_address = document.getElementById('arena_address_container');
+
+ url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+
+var divcontent_start = "<select name=\"arena_address\" id=\"arena_address\"
size\"5\">";
+var divcontent_end = "</select>";
+
+ var callback = {
+ success: function(response){
+ div_address.innerHTML =
divcontent_start + JSON.parse(response.responseText) + divcontent_end;
+ },
+ failure: function(o) {
+ alert("AJAX doesn't work"); //FAILURE
+ }
+ }
+ var trans = YAHOO.util.Connect.asyncRequest('GET', url, callback, null);
+
+}
+
function get_address_search_cp2()
{
var address = document.getElementById('contact2_address_txt').value;
@@ -64,12 +99,19 @@
}
+function run_checks()
+{
+ check_external();
+ checkNewArena();
+}
+
function check_internal()
{
if(document.getElementById('internal_arena_id').value != null &&
document.getElementById('internal_arena_id').value > 0)
{
//disable external arena drop-down
document.getElementById('arena_id').disabled="disabled";
+ document.getElementById('new_arena_fields').style.display =
"none";
}
else
{
@@ -80,7 +122,7 @@
function check_external()
{
- if(document.getElementById('arena_id').value != null &&
document.getElementById('arena_id').value > 0)
+ if(document.getElementById('arena_id').value != null &&
(document.getElementById('arena_id').value > 0 ||
document.getElementById('arena_id').value == 'new_arena'))
{
//disable internal arena drop-down
document.getElementById('internal_arena_id').disabled="disabled";
@@ -89,6 +131,7 @@
{
//enable internal arena drop-down
document.getElementById('internal_arena_id').disabled="";
+ document.getElementById('new_arena_fields').style.display =
"none";
}
}
@@ -236,8 +279,9 @@
<?php
$current_arena_id =
$activity->get_arena();
?>
- <select name="arena_id" id="arena_id"
onchange="javascript: check_external();">
+ <select name="arena_id" id="arena_id"
onchange="javascript: run_checks();">
<option value="0">Ingen arena
valgt</option>
+ <option value="new_arena">Ny
arena</option>
<?php
foreach($arenas as $arena)
{
@@ -246,6 +290,20 @@
?>
</select>
</dd>
+ <span id="new_arena_fields" style="display:
none;">
+ <dt>
+ <label for="new_arena"><?php
echo lang('new_arena') ?></label>
+ </dt>
+ <dt><label for="arena_name"><?php echo
lang('name') ?></label></dt>
+ <dd><input type="text"
name="arena_name" id="arena_name" /></dd>
+ <dt><label for="arena_address"><?php
echo lang('address') ?></label></dt>
+ <dd><input type="text"
name="arena_address_txt" id="arena_address_txt"
onkeyup="javascript:get_address_search_arena()"/>
+ <div id="arena_address_container"></div>
+ <label for="arena_number">Nummer</label>
+ <input type="text"
name="arena_number"/><br/>
+ <label
for="arena_postaddress">Postnummer og Sted</label>
+ <input type="text"
name="arena_postaddress"/></dd>
+ </span>
<dt>
<label for="time"><?php echo
lang('time') ?></label>
</dt>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8336],
Erik Holm-Larsen <=