[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10403] Added reject-button on new/changed organizati
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [10403] Added reject-button on new/changed organizations |
|
Date: |
Thu, 01 Nov 2012 09:37:21 +0000 |
Revision: 10403
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10403
Author: erikhl
Date: 2012-11-01 09:37:20 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
Added reject-button on new/changed organizations
Bugfix on transfer organization
Modified Paths:
--------------
trunk/activitycalendar/inc/class.soorganization.inc.php
trunk/activitycalendar/inc/class.uiorganization.inc.php
trunk/activitycalendar/setup/phpgw_no.lang
trunk/activitycalendar/templates/base/organization.php
trunk/activitycalendar/templates/base/organization_list_partial.php
Modified: trunk/activitycalendar/inc/class.soorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soorganization.inc.php 2012-11-01
08:32:52 UTC (rev 10402)
+++ trunk/activitycalendar/inc/class.soorganization.inc.php 2012-11-01
09:37:20 UTC (rev 10403)
@@ -633,6 +633,7 @@
$city = $org_info['postaddress'];
$activity_id = 1;
$show_in_portal = 1;
+ $customer_internal = 0;
$columns[] = 'name';
$columns[] = 'homepage';
@@ -645,6 +646,7 @@
$columns[] = 'district';
$columns[] = 'organization_number';
$columns[] = 'activity_id';
+ $columns[] = 'customer_internal';
$columns[] = 'show_in_portal';
$cols = implode(',',$columns);
@@ -659,6 +661,7 @@
$values[] = "'{$district}'";
$values[] = "'{$orgnr}'";
$values[] = $this->marshal($activity_id, 'int');
+ $values[] = $customer_internal;
$values[] = $show_in_portal;
$vals = implode(',',$values);
@@ -896,5 +899,24 @@
return $result;
}
+
+ //$org->set_change_type("rejected");
+ function reject_organization($org_id)
+ {
+ if(isset($org_id))
+ {
+ $query = "UPDATE activity_organization set
change_type='rejected' where id={$org_id}";
+ $result = $this->db->query($query, __LINE__, __FILE__);
+ if(isset($result))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ return false;
+ }
}
?>
Modified: trunk/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiorganization.inc.php 2012-11-01
08:32:52 UTC (rev 10402)
+++ trunk/activitycalendar/inc/class.uiorganization.inc.php 2012-11-01
09:37:20 UTC (rev 10403)
@@ -13,7 +13,7 @@
protected $so_group;
protected $so_contact;
protected $so_activity;
-
+
public $public_functions = array
(
'index' => true,
@@ -23,7 +23,7 @@
'show' => true,
'edit' => true
);
-
+
public function __construct()
{
parent::__construct();
@@ -35,22 +35,22 @@
$config = CreateObject('phpgwapi.config','activitycalendar');
$config->read();
}
-
+
public function index()
{
if(phpgw::get_var('phpgw_return_as') == 'json') {
return $this->index_json();
}
-
+
$this->render('organization_list.php');
}
-
+
public function changed_organizations()
{
self::set_active_menu('activitycalendar::organizationList::changed_organizations');
$this->render('organization_list_changed.php');
}
-
+
public function index_json()
{
$organizations =
activitycalendar_soorganization::get_instance()->get(); //get organizations
@@ -71,7 +71,7 @@
return $this->yui_results($organizations);
}
-
+
public function edit()
{
$GLOBALS['phpgw_info']['flags']['app_header'] .=
'::'.lang('edit');
@@ -91,7 +91,7 @@
}
//var_dump($org);
$districts = $so_activity->get_districts();
-
+
if(isset($_POST['store_organization'])) // The user has
pressed the store button
{
$orgno = phpgw::get_var('orgno');
@@ -114,7 +114,7 @@
//phpgw::get_var('address') . ' ' .
phpgw::get_var('number') . ', ' . phpgw::get_var('postaddress');
//$address_array = explode(",",$address_tmp);
$desc = phpgw::get_var('org_description');
-
+
$org_info = array();
$org_info['name'] = $org->get_name(); //new
$orgno_tmp = $orgno;
@@ -122,8 +122,8 @@
{
$orgno_tmp = NULL;
}
- $org_info['orgnr'] = $orgno_tmp;
-
+ $org_info['orgnr'] = $orgno_tmp;
+
$org_info['homepage'] = $homepage;
$org_info['phone'] = $phone;
$org_info['email'] = $email;
@@ -133,19 +133,19 @@
$org_info['postaddress'] = $city;
$org_info['activity_id'] = '';
$org_info['district'] = $district_name;
-
+
$contact1_id = phpgw::get_var('contact1_id');
$contact2_id = phpgw::get_var('contact2_id');
-
+
$contact1_name =
phpgw::get_var('contact1_name');
$contact1_phone =
phpgw::get_var('contact1_phone');
$contact1_email =
phpgw::get_var('contact1_email');
-
+
$contact2_name =
phpgw::get_var('contact2_name');
$contact2_phone =
phpgw::get_var('contact2_phone');
$contact2_email =
phpgw::get_var('contact2_email');
-
+
$new_org_id =
$so_org->transfer_organization($org_info);
if($new_org_id)
{
@@ -157,9 +157,9 @@
$contact1['mail'] = $contact1_email;
$contact1['org_id'] = $new_org_id;
$so_activity->add_contact_person_org($contact1);
-
- $message = lang('messages_saved_form');
-
+
+ $message = lang('messages_saved_form');
+
//get affected activities and update
with new org id
$update_activities =
$so_activity->get_activities_for_update($id);
//var_dump($update_activities);
@@ -170,7 +170,7 @@
$act->set_new_org(false);
$so_activity->store($act);
}
-
+
//set local organization as stored
$org->set_change_type("added");
$org->set_transferred(true);
@@ -182,6 +182,32 @@
}
$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'activitycalendar.uidashboard.index'));
}
+ if(isset($_POST['reject_organization'])) // The user
has pressed the reject button
+ {
+ $reject_org_id = $id;
+ if($so_org->reject_organization($reject_org_id))
+ {
+ $update_activities =
$so_activity->get_activities_for_update($reject_org_id);
+ //var_dump($update_activities);
+ foreach($update_activities as $act_id)
+ {
+ $act =
$so_activity->get_single($act_id);
+ $act->set_state(5);
+ $so_activity->store($act);
+ }
+ }
+ else
+ {
+ $error = lang('messages_form_error');
+ }
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'activitycalendar.uidashboard.index'));
+ }
+ if(isset($_POST['reject_organization_update'])) // The
user has pressed the reject button
+ {
+ $reject_org_id = $id;
+ $so_org->reject_organization($reject_org_id);
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'activitycalendar.uidashboard.index'));
+ }
else if(isset($_POST['update_organization'])) // The
user has pressed the store button
{
$original_org_id =
phpgw::get_var('original_org_id');
@@ -203,7 +229,7 @@
$zip = phpgw::get_var('zip_code');
$city = phpgw::get_var('city');
$desc = phpgw::get_var('org_description');
-
+
$org_info = array();
$org_info['name'] = $org->get_name(); //new
$orgno_tmp = $orgno;
@@ -211,8 +237,8 @@
{
$orgno_tmp = NULL;
}
- $org_info['orgnr'] = $orgno_tmp;
-
+ $org_info['orgnr'] = $orgno_tmp;
+
$org_info['homepage'] = $homepage;
$org_info['phone'] = $phone;
$org_info['email'] = $email;
@@ -223,19 +249,19 @@
$org_info['activity_id'] = '';
$org_info['district'] = $district_name;
$org_info['orgid'] = $original_org_id;
-
+
$contact1_id = phpgw::get_var('contact1_id');
$contact2_id = phpgw::get_var('contact2_id');
-
+
$contact1_name =
phpgw::get_var('contact1_name');
$contact1_phone =
phpgw::get_var('contact1_phone');
$contact1_email =
phpgw::get_var('contact1_email');
-
+
$contact2_name =
phpgw::get_var('contact2_name');
$contact2_phone =
phpgw::get_var('contact2_phone');
$contact2_email =
phpgw::get_var('contact2_email');
-
+
$so_org->update_organization($org_info);
$so_activity->delete_contact_persons($original_org_id);
@@ -246,28 +272,28 @@
$contact1['mail'] = $contact1_email;
$contact1['org_id'] = $original_org_id;
$so_activity->add_contact_person_org($contact1);
-
+
$contact2 = array();
$contact2['name'] = $contact2_name;
$contact2['phone'] = $contact2_phone;
$contact2['mail'] = $contact_mail_2;
$contact2['org_id'] = $original_org_id;
$so_activity->add_contact_person_org($contact2);
-
- $message = lang('messages_saved_form');
-
+
+ $message = lang('messages_saved_form');
+
//set local organization as stored
$org->set_change_type("added");
$org->set_transferred(true);
$so_org->update_local($org);
-
+
$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'activitycalendar.uidashboard.index'));
}
-
+
$contact_persons =
$so_contact->get_local_contact_persons($org->get_id());
$cp1 = $contact_persons[0];
$cp2 = $contact_persons[1];
-
+
$data = array
(
'organization' => $org,
@@ -279,10 +305,10 @@
'errorMsgs' => $errorMsgs,
'infoMsgs' => $infoMsgs
);
-
+
return $this->render('organization.php', $data);
}
-
+
public function show()
{
$GLOBALS['phpgw_info']['flags']['app_header'] .=
'::'.lang('view');
@@ -313,7 +339,7 @@
$contact_persons =
$socontact->get_local_contact_persons($group->get_id(), true);
$cp1 = $contact_persons[0];
$cp2 = $contact_persons[1];
-
+
$data = array
(
'group' => $group,
@@ -345,11 +371,11 @@
$keys = array_keys($org_array);
$org = $org_array[$keys[0]];
}
-
+
$contact_persons =
$socontact->get_local_contact_persons($org->get_id());
$cp1 = $contact_persons[0];
$cp2 = $contact_persons[1];
-
+
$data = array
(
'organization' => $org,
@@ -360,13 +386,13 @@
'errorMsgs' => $errorMsgs,
'infoMsgs' => $infoMsgs
);
-
+
return $this->render('organization.php', $data);
//}
}
-
-
+
+
/**
* (non-PHPdoc)
* @see rental/inc/rental_uicommon#query()
@@ -391,17 +417,17 @@
// Create an empty result set
$result_objects = array();
$result_count = 0;
-
+
//Create an empty result set
$parties = array();
-
+
$exp_param = phpgw::get_var('export');
$export = false;
if(isset($exp_param)){
$export=true;
$num_of_objects = null;
}
-
+
//Retrieve the type of query and perform type specific logic
$type = phpgw::get_var('type');
$changed_org = false;
@@ -415,6 +441,7 @@
case 'new_organizations':
$filters = array('new_orgs' => 'true');
$changed_org = true;
+ $sort_field = 'identifier';
break;
case 'changed_groups':
$filters = array('changed_groups' => 'true');
@@ -438,7 +465,7 @@
$result_objects =
activitycalendar_soorganization::get_instance()->get($start_index,
$num_of_objects, $sort_field, $sort_ascending, $search_for, $search_type,
$filters);
$result_count =
activitycalendar_soorganization::get_instance()->get_count($search_for,
$search_type, $filters);
}
-
+
//var_dump($result_objects);
// Create an empty row set
$rows = array();
@@ -470,24 +497,24 @@
if(!$export){
array_walk(
- $organization_data['results'],
- array($this, 'add_actions'),
+ $organization_data['results'],
+ array($this, 'add_actions'),
array(
// Parameters
(non-object pointers)
- $type
// [2] The type of
query
+ $type
// [2] The type of query
)
);
}
-
-
+
+
return $this->yui_results($organization_data, 'total_records',
'results');
}
-
+
public function get_organization_groups()
{
- $GLOBALS['phpgw_info']['flags']['noheader'] = true;
- $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
+ $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');
$group_id = phpgw::get_var('groupid');
$returnHTML = "<option value='0'>Ingen gruppe valgt</option>";
@@ -501,7 +528,7 @@
$selected = "";
if($group_id && $group_id > 0)
{
- $gr_id = (int)$group_id;
+ $gr_id = (int)$group_id;
if($gr_id ==
(int)$group->get_id())
{
$selected_group = "
selected";
@@ -513,8 +540,8 @@
$html = implode(' ' , $group_html);
$returnHTML = $returnHTML . ' ' . $html;
}
-
-
+
+
return $returnHTML;
//return "<option>Ingen gruppe valgt</option>";
}
@@ -530,18 +557,18 @@
$party_id = (int)phpgw::get_var('id');
if(isset($party_id) && $party_id > 0)
{
- $party =
rental_soparty::get_instance()->get_single($party_id);
+ $party =
rental_soparty::get_instance()->get_single($party_id);
}
else
{
$this->render('permission_denied.php',array('error' =>
lang('invalid_request')));
return;
}
-
+
if(isset($party) && $party->has_permission(PHPGW_ACL_READ))
{
return $this->render(
- 'party.php',
+ 'party.php',
array (
'party' => $party,
'editable' => false,
@@ -560,7 +587,7 @@
$browser->content_header('export.txt','text/plain');
print rental_soparty::get_instance()->get_export_data();
}
-
+
/**
* Add action links and labels for the context menu of the list items
*
@@ -576,7 +603,7 @@
$value['labels'] = array();
$query_type = $params[0];
-
+
switch($query_type)
{
case 'all_organizations':
@@ -590,7 +617,7 @@
}
$value['labels'][] = lang('show');
break;
-
+
case 'changed_organizations':
$value['ajax'][] = false;
if($value['organization_id'] != '' &&
$value['organization_id'] != null){
Modified: trunk/activitycalendar/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendar/setup/phpgw_no.lang 2012-11-01 08:32:52 UTC (rev
10402)
+++ trunk/activitycalendar/setup/phpgw_no.lang 2012-11-01 09:37:20 UTC (rev
10403)
@@ -63,7 +63,7 @@
contact 1 activitycalendar no Kontakt 1
contact 2 activitycalendar no Kontakt 2
contact person activitycalendar no Kontaktperson
-contact information activitycalendar no Kontaktinformasjon
+contact information activitycalendar no Kontaktinformasjon
cost activitycalendar no Pris
create activitycalendar no Lagre
created activitycalendar no Opprettet
@@ -104,7 +104,7 @@
id activitycalendar no ID
inactivate activitycalendar no Inaktivert
inactive activitycalendar no Inaktiv
-invoice information activitycalendar no Fakturainformasjon
+invoice information activitycalendar no Fakturainformasjon
responsible applicant activitycalendar no Ansvarlig søker
jan activitycalendar no januar
jul activitycalendar no juli
@@ -415,7 +415,7 @@
organization_helptext activitycalendar no Velg organisasjon eller
registrer inn ny.<br/>Stå i feltet og skriv inn første bokstav for å få opp
oversikt.
group_helptext activitycalendar no Velg gruppe/lag, eller
ingen.<br/>Feltet vis i portal må være satt til JA om lag/gruppe skal komme opp
i listen.
criteria_label activitycalendar no Valgkriterier/søkeord i portalen
-criteria_helptext activitycalendar no Feltene må fylles ut
for at aktiviteten skal komme frem i søk i portalen, koder for kategori og
målgruppe hentes fra booking.
+criteria_helptext activitycalendar no Feltene må fylles ut
for at aktiviteten skal komme frem i søk i portalen, koder for kategori og
målgruppe hentes fra booking.
what activitycalendar no HVA
where_when activitycalendar no HVOR/NÅR
who activitycalendar no HVEM
@@ -440,4 +440,5 @@
contact_person_1_mail activitycalendar no Kontaktperson 1 epost
contact_person_2_name activitycalendar no Kontaktperson 2
contact_person_2_phone activitycalendar no Kontaktperson 2 tlf
-contact_person_2_mail activitycalendar no Kontaktperson 2 epost
\ No newline at end of file
+contact_person_2_mail activitycalendar no Kontaktperson 2 epost
+reject activitycalendar no Avvis organisasjon
\ No newline at end of file
Modified: trunk/activitycalendar/templates/base/organization.php
===================================================================
--- trunk/activitycalendar/templates/base/organization.php 2012-11-01
08:32:52 UTC (rev 10402)
+++ trunk/activitycalendar/templates/base/organization.php 2012-11-01
09:37:20 UTC (rev 10403)
@@ -17,10 +17,10 @@
<dd><?php echo $organization->get_name();?></dd>
<dt><label
for="orgno">Organisasjonsnummer</label></dt>
<dd>
- <?php
+ <?php
if($editable){?>
<input type="text" name="orgno"
value="<?php echo $organization->get_organization_number();?>"/><br/>
- <?php
+ <?php
}else{?>
<?php echo
$organization->get_organization_number();?>
<?php }?>
@@ -31,12 +31,12 @@
<?php $curr_district =
$organization->get_district();
if(!is_numeric($curr_district))
{
- $curr_district =
activitycalendar_soactivity::get_instance()->get_district_from_name($organization->get_district());
+ $curr_district =
activitycalendar_soactivity::get_instance()->get_district_from_name($organization->get_district());
}
?>
<select name="org_district">
<option value="0">Ingen bydel
valgt</option>
- <?php
+ <?php
foreach($districts as $d){?>
<option value="<?php
echo $d['part_of_town_id']?>" <?php echo ($curr_district ==
$d['part_of_town_id'])? 'selected' : '' ?>><?php echo $d['name']?></option>
<?php }?>
@@ -46,7 +46,7 @@
if($organization->get_district()){?>
<?php echo
activitycalendar_soactivity::get_instance()->get_district_from_id($organization->get_district());?>
<?php }
-
+
}else{
if($organization->get_district() &&
is_numeric($organization->get_district())){?>
<?php echo
activitycalendar_soactivity::get_instance()->get_district_from_id($organization->get_district());?>
@@ -167,10 +167,12 @@
if($organization->get_original_org_id() && $organization->get_original_org_id()
> 0)
{
echo '<input
type="submit" name="update_organization" value="' . lang('update_org') . '"/>';
+ echo '<input
type="submit" name="reject_organization_update" value="' . lang('reject') .
'"/>';
}
else
{
echo '<input
type="submit" name="store_organization" value="' . lang('store') . '"/>';
+ echo '<input
type="submit" name="reject_organization" value="' . lang('reject') . '"/>';
}
echo '<a href="' . $cancel_link
. '">' . lang('back_to_list') . '</a>';
}
@@ -187,4 +189,3 @@
</form>
</div>
</div>
-
\ No newline at end of file
Modified: trunk/activitycalendar/templates/base/organization_list_partial.php
===================================================================
--- trunk/activitycalendar/templates/base/organization_list_partial.php
2012-11-01 08:32:52 UTC (rev 10402)
+++ trunk/activitycalendar/templates/base/organization_list_partial.php
2012-11-01 09:37:20 UTC (rev 10403)
@@ -9,11 +9,56 @@
window.location =
'index.php?menuaction=activitycalendar.uiorganization.index';
}
);
-
+<?php
+ if($list_id == 'new_organizations')
+ {
+ ?>
// Defining columns for datatable
var columnDefs = [{
key: "organization_number",
label: "<?php echo lang('organization_number') ?>",
+ sortable: false
+ },
+ {
+ key: "name",
+ label: "<?php echo lang('name') ?>",
+ sortable: false
+ },
+ {
+ key: "district",
+ label: "<?php echo lang('district') ?>",
+ sortable: false
+ },
+ {
+ key: "office",
+ label: "<?php echo lang('office') ?>",
+ sortable: false
+ },
+ {
+ key: "description",
+ label: "<?php echo lang('description') ?>",
+ sortable: false
+ },
+ {
+ key: "actions",
+ hidden: true
+ },
+ {
+ key: "labels",
+ hidden: true
+ },
+ {
+ key: "ajax",
+ hidden: true
+ }
+ ];
+<?php }
+ else
+ {?>
+ // Defining columns for datatable
+ var columnDefs = [{
+ key: "organization_number",
+ label: "<?php echo lang('organization_number') ?>",
sortable: true
},
{
@@ -49,6 +94,8 @@
hidden: true
}
];
+<?php }
+ ?>
<?php
if(isset($extra_cols)){
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10403] Added reject-button on new/changed organizations,
Erik Holm-Larsen <=