[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8483]
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [8483] |
|
Date: |
Wed, 04 Jan 2012 09:59:17 +0000 |
Revision: 8483
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8483
Author: erikhl
Date: 2012-01-04 09:59:17 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/activitycalendar/inc/class.soactivity.inc.php
trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
trunk/activitycalendarfrontend/setup/phpgw_no.lang
trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php
Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2012-01-04 07:56:59 UTC
(rev 8482)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2012-01-04 09:59:17 UTC
(rev 8483)
@@ -152,6 +152,10 @@
$activity_state =
$this->marshal($filters['activity_state'],'int');
$filter_clauses[] = "activity.state =
{$activity_state}";
}
+ if(isset($filters['activity_org']) && $filters['activity_org']
!= '0'){
+ $activity_org =
$this->marshal($filters['activity_org'],'int');
+ $filter_clauses[] = "activity.organization_id =
{$activity_org}";
+ }
if(isset($filters['activity_category']) &&
$filters['activity_category'] != 'all'){
$activity_category =
$this->marshal($filters['activity_category'],'int');
$filter_clauses[] = "activity.category =
{$activity_category}";
Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-01-04
07:56:59 UTC (rev 8482)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2012-01-04
09:59:17 UTC (rev 8483)
@@ -27,7 +27,8 @@
'index' => true,
'get_organization_groups' => true,
'get_address_search' => true,
- 'edit_organization_values' => true
+ 'edit_organization_values' => true,
+ 'get_organization_activities' => true
);
public function __construct()
@@ -427,12 +428,14 @@
{
$activity_id = phpgw::get_var('activity_id');
$activity =
$this->so_activity->get_single($activity_id);
+ $org =
$this->so_organization->get_single($activity->get_organization_id());
+
//store update-request
$activity->set_state(2);
if($this->so_activity->store($activity))
{
- $message = lang('update_request_sent',
$activity->get_title());
+ $message = lang('update_request_sent',
$activity->get_title(), $org->get_name());
return
$this->render('activity_edit_step_1.php', array
(
'activities' =>
$activities,
@@ -448,9 +451,11 @@
{
//select activity to edit
$activities =
$this->so_activity->get(null, null, 'title', true, null, null,
array('activity_state' => 3));
+ $organizations =
$this->so_organization->get(null, null, 'org.name', true, null, null, null);
return
$this->render('activity_edit_step_1.php', array
(
- 'activities' =>
$activities
+ 'activities' =>
$activities,
+ 'organizations' =>
$organizations
)
);
}
@@ -763,4 +768,30 @@
}
}
}
+
+ public function get_organization_activities()
+ {
+ $GLOBALS['phpgw_info']['flags']['noheader'] = true;
+ $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
+ $GLOBALS['phpgw_info']['flags']['xslt_app'] = false;
+
+ $org_id = phpgw::get_var('orgid');
+ $returnHTML = "<option value='0'>Ingen aktivitet
valgt</option>";
+ if($org_id)
+ {
+ $activities = $this->so_activity->get(null,
null, 'title', true, null, null, array('activity_state' => 3, 'activity_org' =>
$org_id));
+ foreach ($activities as $act) {
+ if(isset($act))
+ {
+ //$res_g = $group->serialize();
+ $activity_html[] = "<option
value='" . $act->get_id() . "'>" . $act->get_title() . "</option>";
+ }
+ }
+ $html = implode(' ' , $activity_html);
+ $returnHTML = $returnHTML . ' ' . $html;
+ }
+
+
+ return $returnHTML;
+ }
}
Modified: trunk/activitycalendarfrontend/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendarfrontend/setup/phpgw_no.lang 2012-01-04 07:56:59 UTC
(rev 8482)
+++ trunk/activitycalendarfrontend/setup/phpgw_no.lang 2012-01-04 09:59:17 UTC
(rev 8483)
@@ -83,9 +83,10 @@
store_org_group activitycalendarfrontend no Lagre
organisasjon/gruppe
save_activity activitycalendarfrontend no Send
org_helptext_step1 activitycalendarfrontend no Velg
organisasjon aktiviteten skal knyttes til i nedtrekksmenyen, du kan søke ved å
skrive inn navnet.<br/>Dersom din organisasjon ikke finnes, velg "Ny
organisasjon"<br/>Klikk deretter på "Neste" for å registrere aktivitet.
+activity_org_helptext_step1 activitycalendarfrontend no Velg
organisasjon aktiviteten som skal endres er tilknyttet i nedtrekksmenyen, du
kan søke ved å skrive inn navnet.
next activitycalendarfrontend no Neste
new_activity activitycalendarfrontend no Ny aktivitet
-update_request_sent activitycalendarfrontend no
Oppdateringsforespørsel er sendt for aktiviteten "%1"
+update_request_sent activitycalendarfrontend no
Oppdateringsforespørsel er sendt for aktiviteten "%1" tilknyttet organisasjon
"%2"
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
Modified: trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php
2012-01-04 07:56:59 UTC (rev 8482)
+++ trunk/activitycalendarfrontend/templates/base/activity_edit_step_1.php
2012-01-04 09:59:17 UTC (rev 8483)
@@ -2,7 +2,7 @@
<script type="text/javascript">
function isOK()
{
- if(document.getElementById('activity_id').value == null ||
document.getElementById('activity_id').value == '')
+ if(document.getElementById('activity_id').value == null ||
document.getElementById('activity_id').value == '' ||
document.getElementById('activity_id').value == 0)
{
alert("Du må velge en aktivitet som skal endres!");
return false;
@@ -12,28 +12,65 @@
return true;
}
}
+function get_activities()
+{
+ var org_id = document.getElementById('organization_id').value;
+ var div_select = document.getElementById('activity_select');
+
+ url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_activities&phpgw_return_as=json&orgid="
+ org_id;
+
+var divcontent_start = "<select name=\"activity_id\" id=\"activity_id\">";
+var divcontent_end = "</select>";
+
+ var callback = {
+ success: function(response){
+ div_select.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);
+
+}
+
+YAHOO.util.Event.onDOMReady(function()
+{
+ get_activities();
+});
</script>
<div class="yui-content" style="width: 100%;">
<h1><?php echo lang('edit_activity');?></h1>
<form action="#" method="post">
<dl class="proplist-col" style="width: 200%">
<dt>
- <?php echo
lang('activity_edit_helptext');?><br/><br/>
+ <?php echo
lang('activity_org_helptext_step1')?><br/><br/>
</dt>
<dd>
<?php if($message){?>
<?php echo $message;?>
<?php }else{?>
- <select name="activity_id" id="activity_id">
- <option value="">Ingen aktivitet
valgt</option>
+ <select name="organization_id"
id="organization_id" onchange="javascript: get_activities();">
+ <option value="">Ingen organisasjon
valgt</option>
<?php
- foreach($activities as $activity)
+ foreach($organizations as $organization)
{
- echo "<option
value=\"{$activity->get_id()}\">".$activity->get_title()."</option>";
+ echo "<option
value=\"{$organization->get_id()}\">".$organization->get_name()."</option>";
}
?>
</select>
<br/><br/>
+ </dd>
+ <dt>
+ <?php echo
lang('activity_edit_helptext');?><br/><br/>
+ </dt>
+ <dd>
+ <div id="activity_select">
+ <select name="activity_id"
id="activity_id">
+ <option value="0">Ingen
aktivitet valgt</option>
+ </select>
+ </div>
+ <br/><br/>
<?php }?>
</dd>
<?php if(!$message){?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8483],
Erik Holm-Larsen <=