[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7444] Merge from trunk.
|
From: |
Thomas Lundquist |
|
Subject: |
[Fmsystem-commits] [7444] Merge from trunk. |
|
Date: |
Tue, 28 Jun 2011 11:07:59 +0000 |
Revision: 7444
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7444
Author: thomasez
Date: 2011-06-28 11:07:59 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
Merge from trunk.
Modified Paths:
--------------
branches/dev-thomasez/activitycalendar/inc/class.soactivity.inc.php
branches/dev-thomasez/activitycalendar/inc/class.soarena.inc.php
branches/dev-thomasez/activitycalendar/inc/class.soorganization.inc.php
branches/dev-thomasez/activitycalendar/inc/class.uiactivities.inc.php
branches/dev-thomasez/activitycalendar/inc/class.uiarena.inc.php
branches/dev-thomasez/activitycalendar/inc/class.uiorganization.inc.php
branches/dev-thomasez/activitycalendar/js/activitycalendar/common.js
branches/dev-thomasez/activitycalendar/setup/phpgw_no.lang
branches/dev-thomasez/activitycalendar/templates/base/activity.php
branches/dev-thomasez/activitycalendar/templates/base/arena.php
branches/dev-thomasez/activitycalendarfrontend/templates/base/activity.php
branches/dev-thomasez/booking/inc/class.uiresource.inc.php
branches/dev-thomasez/booking/setup/tables_current.inc.php
branches/dev-thomasez/frontend/inc/class.uientity.inc.php
branches/dev-thomasez/frontend/templates/base/attributes_view.xsl
branches/dev-thomasez/frontend/templates/base/entityview.xsl
branches/dev-thomasez/property/inc/class.boentity.inc.php
branches/dev-thomasez/property/inc/class.soadmin_location.inc.php
branches/dev-thomasez/property/inc/class.solocation.inc.php
branches/dev-thomasez/property/inc/class.uiadmin_location.inc.php
branches/dev-thomasez/property/inc/class.uientity.inc.php
branches/dev-thomasez/property/inc/class.uigallery.inc.php
branches/dev-thomasez/property/inc/class.uiimport.inc.php
branches/dev-thomasez/property/inc/class.uilocation.inc.php
branches/dev-thomasez/property/inc/class.uitts.inc.php
branches/dev-thomasez/property/inc/hook_settings.inc.php
branches/dev-thomasez/property/inc/import/default/cvs_import_kunstoversikt_bkb
branches/dev-thomasez/property/setup/phpgw_no.lang
branches/dev-thomasez/property/setup/setup.inc.php
branches/dev-thomasez/property/setup/tables_current.inc.php
branches/dev-thomasez/property/setup/tables_update.inc.php
branches/dev-thomasez/property/templates/base/admin_location.xsl
branches/dev-thomasez/property/templates/base/entity.xsl
Added Paths:
-----------
branches/dev-thomasez/property/inc/import/default/cvs_import_romdata_bkb
branches/dev-thomasez/sms/inc/plugin/gateway/pswin/
Property Changed:
----------------
branches/dev-thomasez/
branches/dev-thomasez/property/inc/cron/cron.php
branches/dev-thomasez/property/inc/cron/default/Import_fra_basware_X205.php
branches/dev-thomasez/property/inc/cron/default/export_info_as_files.php
branches/dev-thomasez/property/inc/cron/default/forward_mail_as_sms.php
branches/dev-thomasez/property/inc/cron/default/import_files.php
branches/dev-thomasez/property/inc/cron/default/import_from_scanner.php
branches/dev-thomasez/property/inc/cron/default/lag_lang_filer.php
branches/dev-thomasez/property/inc/cron/default/oppdater_antall_leieobjekt.php
branches/dev-thomasez/property/inc/cron/default/oppdater_namssakstatus_pr_leietaker.php
branches/dev-thomasez/property/inc/cron/default/oppdater_utgaatt_objekt.php
branches/dev-thomasez/property/inc/cron/default/organize_drawing.php
branches/dev-thomasez/property/inc/cron/default/synkroniser_med_boei.php
branches/dev-thomasez/property/inc/cron/default/update_googlemap.php
branches/dev-thomasez/property/inc/cron/default/update_phpgw.php
branches/dev-thomasez/property/inc/cron/default/update_workorder_status.php
branches/dev-thomasez/property/inc/custom/default/estimert_ferdigdato_til_leieobjekt_BBB.php
branches/dev-thomasez/property/inc/custom/default/hent_maaler_nr_til_besikt_rapport.php
branches/dev-thomasez/property/inc/custom/default/innflyttetdato_entity_2_11_BBB.php
branches/dev-thomasez/property/inc/custom/default/kalkuler_risiko_for_ros.php
branches/dev-thomasez/property/inc/export/default/Agresso
branches/dev-thomasez/property/inc/export/default/Ecolink
branches/dev-thomasez/property/inc/export/default/GABNr
branches/dev-thomasez/property/inc/export/default/Kemner_kvittering
branches/dev-thomasez/property/inc/import/default/Import_fra_BKK
branches/dev-thomasez/property/inc/import/default/Import_fra_BKK_csv
branches/dev-thomasez/property/inc/import/default/Import_fra_Kemner
branches/dev-thomasez/property/inc/import/default/Import_fra_Kemner_xml
branches/dev-thomasez/property/inc/import/default/Import_fra_Service
branches/dev-thomasez/property/inc/import/default/Import_fra_Service_xml
branches/dev-thomasez/property/inc/import/default/import_fra_Service_xls
branches/dev-thomasez/rental/inc/model/class.composite.inc.php
branches/dev-thomasez/rental/inc/model/class.contract_date.inc.php
branches/dev-thomasez/rental/inc/model/class.unit.inc.php
branches/dev-thomasez/sms/bin/default/config_BR
branches/dev-thomasez/sms/bin/default/config_BR_log
branches/dev-thomasez/sms/bin/default/config_SD
branches/dev-thomasez/sms/bin/default/config_SD_log
branches/dev-thomasez/sms/bin/default/config_ST
branches/dev-thomasez/sms/bin/default/config_STATUS_log
branches/dev-thomasez/sms/bin/default/config_ST_log
branches/dev-thomasez/sms/bin/default/config_VASK
branches/dev-thomasez/sms/bin/default/config_VASK_log
branches/dev-thomasez/sms/bin/default/log_firealarm.php
branches/dev-thomasez/sms/bin/default/receipt_service_agreement.php
branches/dev-thomasez/sms/bin/default/set_workorder_status.php
Property changes on: branches/dev-thomasez
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk:7411-7440
Modified: branches/dev-thomasez/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- branches/dev-thomasez/activitycalendar/inc/class.soactivity.inc.php
2011-06-28 11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/activitycalendar/inc/class.soactivity.inc.php
2011-06-28 11:07:59 UTC (rev 7444)
@@ -850,10 +850,10 @@
function add_group($group_info)
{
- $name = $org_info['name'];
- $orgid = $org_info['organization_id'];
- $description = $org_info['description'];
- $activity_id = $org_info['activity_id'];
+ $name = $group_info['name'];
+ $orgid = $group_info['organization_id'];
+ $description = $group_info['description'];
+ $activity_id = $group_info['activity_id'];
$show_in_portal = 1;
$columns[] = 'name';
@@ -863,9 +863,9 @@
$columns[] = 'show_in_portal';
$cols = implode(',',$columns);
- $values[] = "{$name}";
- $values[] = "{$description}";
- $values[] = "{$orgid}";
+ $values[] = "'{$name}'";
+ $values[] = "'{$description}'";
+ $values[] = "'{$orgid}'";
$values[] = $activity_id;
$values[] = $show_in_portal;
$vals = implode(',',$values);
@@ -902,10 +902,10 @@
function add_contact_person_org($contact)
{
- $name = $contact2['name'];
- $phone = $contact2['phone'];
- $mail = $contact2['mail'];
- $org_id = $contact2['org_id'];
+ $name = $contact['name'];
+ $phone = $contact['phone'];
+ $mail = $contact['mail'];
+ $org_id = $contact['org_id'];
$ssn = '';
$columns[] = 'name';
@@ -915,10 +915,10 @@
$columns[] = 'organization_id';
$cols = implode(',',$columns);
- $values[] = "{$name}";
- $values[] = "{$ssn}";
- $values[] = "{$phone}";
- $values[] = "{$mail}";
+ $values[] = "'{$name}'";
+ $values[] = "'{$ssn}'";
+ $values[] = "'{$phone}'";
+ $values[] = "'{$mail}'";
$values[] = $org_id;
$vals = implode(',',$values);
@@ -934,10 +934,10 @@
function add_contact_person_group($contact)
{
- $name = $contact2['name'];
- $phone = $contact2['phone'];
- $mail = $contact2['mail'];
- $org_id = $contact2['group_id'];
+ $name = $contact['name'];
+ $phone = $contact['phone'];
+ $mail = $contact['mail'];
+ $org_id = $contact['group_id'];
$columns[] = 'name';
$columns[] = 'phone';
@@ -945,9 +945,9 @@
$columns[] = 'group_id';
$cols = implode(',',$columns);
- $values[] = "{$name}";
- $values[] = "{$phone}";
- $values[] = "{$mail}";
+ $values[] = "'{$name}'";
+ $values[] = "'{$phone}'";
+ $values[] = "'{$mail}'";
$values[] = $org_id;
$vals = implode(',',$values);
Modified: branches/dev-thomasez/activitycalendar/inc/class.soarena.inc.php
===================================================================
--- branches/dev-thomasez/activitycalendar/inc/class.soarena.inc.php
2011-06-28 11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/activitycalendar/inc/class.soarena.inc.php
2011-06-28 11:07:59 UTC (rev 7444)
@@ -278,5 +278,22 @@
}
return $ret;
}
+
+ public function get_address($search)
+ {
+ $result_arr = array();
+ $result_arr[] = "<option>Ingen</option>";
+ if($search)
+ {
+ $sql = "select * from fm_streetaddress where
UPPER(descr) like UPPER('{$search}%')";
+ $this->db->query($sql, __LINE__, __FILE__);
+ while($this->db->next_record()){
+ //$result_arr = $this->db->f('name');
+ $result_arr[] = "<option value='" .
$this->db->f('descr') . "'>" . $this->db->f('descr') . "</option>";
+ }
+ }
+ $result = implode(' ' , $result_arr);
+ return $result;
+ }
}
?>
\ No newline at end of file
Modified:
branches/dev-thomasez/activitycalendar/inc/class.soorganization.inc.php
===================================================================
--- branches/dev-thomasez/activitycalendar/inc/class.soorganization.inc.php
2011-06-28 11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/activitycalendar/inc/class.soorganization.inc.php
2011-06-28 11:07:59 UTC (rev 7444)
@@ -62,6 +62,9 @@
case "district":
$like_clauses[] = "org.district
$this->like $like_pattern";
break;
+ default:
+ $like_clauses[] = "org.name $this->like
$like_pattern";
+ break;
}
@@ -73,6 +76,11 @@
$filter_clauses = array();
$filter_clauses[] = "show_in_portal=1";
+
+ if(isset($filters[$this->get_id_field_name()])){
+ $id =
$this->marshal($filters[$this->get_id_field_name()],'int');
+ $filter_clauses[] = "org.id = {$id}";
+ }
/*
// All parties with contracts of type X
Modified: branches/dev-thomasez/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- branches/dev-thomasez/activitycalendar/inc/class.uiactivities.inc.php
2011-06-28 11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/activitycalendar/inc/class.uiactivities.inc.php
2011-06-28 11:07:59 UTC (rev 7444)
@@ -18,7 +18,8 @@
'add' => true,
'edit' => true,
'download' => true,
- 'send_mail' => true
+ 'send_mail' => true,
+ 'get_organization_groups' => true
);
public function __construct()
@@ -392,5 +393,41 @@
}
}
}
+
+ public function get_organization_groups()
+ {
+ $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>";
+ if($org_id)
+ {
+ $groups =
activitycalendar_sogroup::get_instance()->get(null, null, null, null, null,
null, array('org_id' => $org_id));
+ foreach ($groups as $group) {
+ if(isset($group))
+ {
+ //$res_g = $group->serialize();
+ $selected = "";
+ if($group_id && $group_id > 0)
+ {
+ $gr_id = (int)$group_id;
+ if($gr_id ==
(int)$group->get_id())
+ {
+ $selected_group = "
selected";
+ }
+ }
+ $group_html[] = "<option value='" .
$group->get_id() . "'". $selected_group . ">" . $group->get_name() .
"</option>";
+ }
+ }
+ $html = implode(' ' , $group_html);
+ $returnHTML = $returnHTML . ' ' . $html;
+ }
+
+
+ return $returnHTML;
+ }
}
?>
Modified: branches/dev-thomasez/activitycalendar/inc/class.uiarena.inc.php
===================================================================
--- branches/dev-thomasez/activitycalendar/inc/class.uiarena.inc.php
2011-06-28 11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/activitycalendar/inc/class.uiarena.inc.php
2011-06-28 11:07:59 UTC (rev 7444)
@@ -12,7 +12,8 @@
'query' => true,
'view' => true,
'add' => true,
- 'edit' => true
+ 'edit' => true,
+ 'get_address_search' => true
);
public function __construct()
@@ -31,6 +32,16 @@
$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'activitycalendar.uiarena.edit'));
}
+ /**
+ * Public method.
+ */
+ public function get_address_search()
+ {
+ $search_string = phpgw::get_var('search');
+ //var_dump($search_string);
+ return
activitycalendar_soarena::get_instance()->get_address($search_string);
+ }
+
public function index()
{
// No messages so far
@@ -92,7 +103,7 @@
// ... set all parameters
$arena->set_internal_arena_id(phpgw::get_var('internal_arena_id'));
$arena->set_arena_name(phpgw::get_var('arena_name'));
- $arena->set_address(phpgw::get_var('address'));
+ $arena->set_address(phpgw::get_var('address') .
' ' . phpgw::get_var('address_no'));
if(activitycalendar_soarena::get_instance()->store($arena)) // ... and then try
to store the object
{
Modified:
branches/dev-thomasez/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
--- branches/dev-thomasez/activitycalendar/inc/class.uiorganization.inc.php
2011-06-28 11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/activitycalendar/inc/class.uiorganization.inc.php
2011-06-28 11:07:59 UTC (rev 7444)
@@ -12,7 +12,10 @@
(
'index' => true,
'query' => true,
- 'get_organization_groups' => true
+ 'changed_organizations' => true,
+ 'get_organization_groups' => true,
+ 'show' => true,
+ 'edit' => true
);
public function __construct()
@@ -32,6 +35,11 @@
$this->render('organization_list.php');
}
+ public function changed_organizations()
+ {
+ $this->render('organization_list_changed.php');
+ }
+
public function index_json()
{
$organizations =
activitycalendar_soorganization::get_instance()->get(); //get organizations
@@ -53,7 +61,59 @@
return $this->yui_results($organizations);
}
+ public function edit()
+ {
+ $id = (int)phpgw::get_var('id');
+ $type = phpgw::get_var('type');
+ if($type)
+ {
+ //var_dump($type);
+ $so = activitycalendar_sogroup::get_instance();
+ }
+ else
+ {
+ //var_dump('org');
+ $so = activitycalendar_soorganization::get_instance();
+ }
+ }
+ public function show()
+ {
+ $id = (int)phpgw::get_var('id');
+ $type = phpgw::get_var('type');
+ if($type)
+ {
+ //var_dump($type);
+ $so = activitycalendar_sogroup::get_instance();
+ $group = $so->get(null, null, null, null, null, null,
array('id' => $id));
+
+ return $this->render('group.php', array
+ (
+ 'group' => $group,
+ 'editable' => true,
+ 'message' => isset($message) ? $message
: phpgw::get_var('message'),
+ 'error' => isset($error) ? $error :
phpgw::get_var('error')
+ )
+ );
+ }
+ else
+ {
+ //var_dump('org');
+ $so = activitycalendar_soorganization::get_instance();
+ $org = $so->get(null, null, null, null, null, null,
array('id' => $id));
+
+ return $this->render('organization.php', array
+ (
+ 'organization' => $org,
+ 'editable' => true,
+ 'message' => isset($message) ? $message
: phpgw::get_var('message'),
+ 'error' => isset($error) ? $error :
phpgw::get_var('error')
+ )
+ );
+ }
+ }
+
+
/**
* (non-PHPdoc)
@@ -254,6 +314,27 @@
}
$value['labels'][] = lang('show');
break;
+
+ case 'changed_organizations':
+ $value['ajax'][] = false;
+ if($value['organization_id'] != '' &&
$value['organization_id'] != null){
+ $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.show', 'id' => $value['id'], 'type' =>
'group')));
+ }
+ else
+ {
+ $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.show', 'id' => $value['id'])));
+ }
+ $value['labels'][] = lang('show');
+ $value['ajax'][] = false;
+ if($value['organization_id'] != '' &&
$value['organization_id'] != null){
+ $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.show', 'id' => $value['id'], 'type' =>
'group')));
+ }
+ else
+ {
+ $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.edit', 'id' => $value['id'])));
+ }
+ $value['labels'][] = lang('edit');
+ break;
}
}
}
Modified: branches/dev-thomasez/activitycalendar/js/activitycalendar/common.js
===================================================================
--- branches/dev-thomasez/activitycalendar/js/activitycalendar/common.js
2011-06-28 11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/activitycalendar/js/activitycalendar/common.js
2011-06-28 11:07:59 UTC (rev 7444)
@@ -258,7 +258,7 @@
}
}
-/*
+
YAHOO.activitycalendar.autocompleteHelper = function(url, field, hidden,
container, label_attr) {
label_attr = label_attr || 'name';
var myDataSource = new YAHOO.util.DataSource(url);
@@ -269,20 +269,19 @@
fields: [label_attr, 'id']
};
myDataSource.maxCacheEntries = 5;
- console.log(myDataSource);
- console.log(field);
- console.log(container);
- console.log(YAHOO.widget.AutoComplete);
+ //console.log(myDataSource);
+ //console.log(field);
+ //console.log(container);
+ //console.log(YAHOO.widget.AutoComplete);
var ac = new YAHOO.widget.AutoComplete(field, container, myDataSource);
ac.queryQuestionMark = false;
ac.resultTypeList = false;
ac.forceSelection = true;
- console.log(ac);
+ //console.log(ac);
ac.itemSelectEvent.subscribe(function(sType, aArgs) {
- console.log(aArgs[2]);
+ //console.log(aArgs[2]);
YAHOO.util.Dom.get(hidden).value = aArgs[2].id;
});
return ac;
};
-*/
\ No newline at end of file
Modified: branches/dev-thomasez/activitycalendar/setup/phpgw_no.lang
===================================================================
--- branches/dev-thomasez/activitycalendar/setup/phpgw_no.lang 2011-06-28
11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/activitycalendar/setup/phpgw_no.lang 2011-06-28
11:07:59 UTC (rev 7444)
@@ -378,4 +378,5 @@
mail_body_state_4 activitycalendar no Ditt tips er behandlet
og publisert i kommuneportalen. Mvh %1 kulturkontor
mail_body_state_5 activitycalendar no Ditt tips er behandlet,
men vil ikke bli publisert i kommuneportalen. Mvh %1 kulturkontor
send_mail activitycalendar no Send e-post
-marked_as activitycalendar no Status
\ No newline at end of file
+marked_as activitycalendar no Status
+address_number activitycalendar no Nummer
\ No newline at end of file
Modified: branches/dev-thomasez/activitycalendar/templates/base/activity.php
===================================================================
--- branches/dev-thomasez/activitycalendar/templates/base/activity.php
2011-06-28 11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/activitycalendar/templates/base/activity.php
2011-06-28 11:07:59 UTC (rev 7444)
@@ -10,24 +10,20 @@
function get_available_groups()
{
var org_id = document.getElementById('organization_id').value;
- var group_select = document.getElementById('group_id');
- //alert(group_select);
+ var div_select = document.getElementById('group_select');
+
<?php if($activity->get_group_id()){?>
- url =
"index.php?menuaction=activitycalendar.uiorganization.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id + "&groupid=" + <?php echo $activity->get_group_id();?>;
+ url =
"index.php?menuaction=activitycalendar.uiactivities.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id + "&groupid=" + <?php echo $activity->get_group_id();?>;
<?php }else{?>
- url =
"index.php?menuaction=activitycalendar.uiorganization.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
+ url =
"index.php?menuaction=activitycalendar.uiactivities.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
<?php }?>
+
+var divcontent_start = "<select name=\"group_id\" id=\"group_id\">";
+var divcontent_end = "</select>";
-/* $.ajax({url: url,
- success: function(response) {
- $("#group_id").innerHTML = response;
- }
- });
-*/
var callback = {
success: function(response){
- //alert("det funker");
- group_select.innerHTML =
JSON.parse(response.responseText);
+ div_select.innerHTML = divcontent_start
+ JSON.parse(response.responseText) + divcontent_end;
},
failure: function(o) {
alert("AJAX doesn't work"); //FAILURE
@@ -41,7 +37,6 @@
{
get_available_groups();
});
-
</script>
<div class="yui-content">
@@ -113,9 +108,11 @@
if ($editable)
{
?>
- <select name="group_id"
id="group_id">
- <option value="0">Ingen
gruppe valgt</option>
- </select>
+ <div id="group_select">
+ <select name="group_id"
id="group_id">
+ <option
value="0">Ingen gruppe valgt</option>
+ </select>
+ </div>
<?php
?>
<?php
@@ -273,8 +270,8 @@
}
else
{
- if($activity->get_district()){
- echo
$act_so->get_district_name($activity->get_district());
+ if($activity->get_office()){
+ echo
$act_so->get_office_name($activity->get_office());
}
}
?>
Modified: branches/dev-thomasez/activitycalendar/templates/base/arena.php
===================================================================
--- branches/dev-thomasez/activitycalendar/templates/base/arena.php
2011-06-28 11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/activitycalendar/templates/base/arena.php
2011-06-28 11:07:59 UTC (rev 7444)
@@ -3,6 +3,31 @@
include("common.php");
?>
+<script type="text/javascript">
+
+function get_address_search()
+{
+ var address = document.getElementById('address_txt').value;
+ var div_address = document.getElementById('address_container');
+
+ url =
"index.php?menuaction=activitycalendar.uiarena.get_address_search&phpgw_return_as=json&search="
+ address;
+
+var divcontent_start = "<select name=\"address\" id=\"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);
+
+}
+</script>
+
<div class="identifier-header">
<h1><img src="<?php echo ACTIVITYCALENDAR_IMAGE_PATH
?>images/32x32/custom/contact.png" /><?php echo lang('arena') ?></h1>
<div>
@@ -72,7 +97,9 @@
if ($editable)
{
?>
- <input type="text"
name="address" id="address" value="<?php echo $arena->get_address() ?>" />
+ <input type="text"
name="address" id="address_txt" value="<?php echo $arena->get_address() ?>"
onkeyup="javascript:get_address_search()"/>
+ <div
id="address_container"></div>
+ <label
for="address_number"><?php echo lang('address_number') ?></label><input
type="text" name="address_no" id="address_no"/>
<?php
}
else
Modified:
branches/dev-thomasez/activitycalendarfrontend/templates/base/activity.php
===================================================================
--- branches/dev-thomasez/activitycalendarfrontend/templates/base/activity.php
2011-06-28 11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/activitycalendarfrontend/templates/base/activity.php
2011-06-28 11:07:59 UTC (rev 7444)
@@ -10,19 +10,20 @@
function get_available_groups()
{
var org_id = document.getElementById('organization_id').value;
- var group_select = document.getElementById('group_id');
- //alert(group_select);
+ var div_select = document.getElementById('group_select');
+
<?php if($activity->get_group_id()){?>
url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id + "&groupid=" + <?php echo $activity->get_group_id();?>;
<?php }else{?>
url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
<?php }?>
+
+var divcontent_start = "<select name=\"group_id\" id=\"group_id\">";
+var divcontent_end = "</select>";
var callback = {
success: function(response){
- //alert("det funker");
- group_select.innerHTML =
JSON.parse(response.responseText);
- //group_select.innerHTML =
group_select.innerHTML;
+ div_select.innerHTML = divcontent_start
+ JSON.parse(response.responseText) + divcontent_end;
},
failure: function(o) {
alert("AJAX doesn't work"); //FAILURE
@@ -108,9 +109,11 @@
if ($editable)
{
?>
- <select name="group_id"
id="group_id">
- <option value="0">Ingen
gruppe valgt</option>
- </select>
+ <div id="group_select">
+ <select name="group_id"
id="group_id">
+ <option
value="0">Ingen gruppe valgt</option>
+ </select>
+ </div>
<?php
?>
<?php
Modified: branches/dev-thomasez/booking/inc/class.uiresource.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.uiresource.inc.php 2011-06-28
11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/booking/inc/class.uiresource.inc.php 2011-06-28
11:07:59 UTC (rev 7444)
@@ -118,6 +118,8 @@
public function add()
{
$errors = array();
+ $resource = array();
+ $resource['sort'] = '0';
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
Modified: branches/dev-thomasez/booking/setup/tables_current.inc.php
===================================================================
--- branches/dev-thomasez/booking/setup/tables_current.inc.php 2011-06-28
11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/booking/setup/tables_current.inc.php 2011-06-28
11:07:59 UTC (rev 7444)
@@ -19,9 +19,6 @@
'fd' => array(
'id' => array('type' => 'auto', 'nullable' =>
false),
'active' => array('type' => 'int', 'nullable'
=> False,'precision' => '4', 'default' => 1),
- 'deactive_calendar' => array('type' => 'int',
'nullable' => False,'precision' => '4', 'default' => 0),
- 'deactive_application' => array('type' =>
'int', 'nullable' => False,'precision' => '4', 'default' => 0),
- 'deactive_sendmessage' => array('type' =>
'int', 'nullable' => False,'precision' => '4', 'default' => 0),
'deactivate_calendar' => array('type' => 'int',
'nullable' => False,'precision' => '4', 'default' => 0),
'deactivate_application' => array('type' =>
'int', 'nullable' => False,'precision' => '4', 'default' => 0),
'deactivate_sendmessage' => array('type' =>
'int', 'nullable' => False,'precision' => '4', 'default' => 0),
Modified: branches/dev-thomasez/frontend/inc/class.uientity.inc.php
===================================================================
--- branches/dev-thomasez/frontend/inc/class.uientity.inc.php 2011-06-28
11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/frontend/inc/class.uientity.inc.php 2011-06-28
11:07:59 UTC (rev 7444)
@@ -435,8 +435,6 @@
$vfs = CreateObject('phpgwapi.vfs');
$vfs->override_acl = 1;
- $vfs->override_acl = 0;
-
$j = count($ticket['files']);
for ($i=0;$i<$j;$i++)
{
@@ -467,9 +465,18 @@
$entity_entry['directory']
= urlencode($_files[0]['directory']);
$entity_entry['img_id']
= $_files[0]['file_id'];
}
-
+
for
($i=0;$i<count($uicols['name']);$i++)
{
+ switch ($uicols['name'][$i])
+ {
+ case 'num':
+ case 'loc1':
+ case 'loc1_name':
+
$uicols['input_type'][$i] = 'hidden';
+ break;
+ }
+
if($uicols['input_type'][$i]!='hidden')
{
if(isset($entity_entry['query_location'][$uicols['name'][$i]]))
@@ -510,7 +517,7 @@
$j++;
}
}
-
+ $vfs->override_acl = 0;
//indica que de la fila seleccionada escogera de la
columna "id" el valor "id". Para agregarlo al URL
$parameters = array
(
@@ -587,14 +594,21 @@
'text' =>
lang('start ticket'),
'action' =>
$GLOBALS['phpgw']->link('/index.php',array
(
- 'menuaction'
=> 'frontend.uihelpdesk.add_ticket',
- 'noframework'
=> 1,
- 'target'
=> '_lightbox'
+ 'menuaction' =>
'frontend.uihelpdesk.add_ticket',
+ 'noframework' => 1,
+ 'target'
=> '_lightbox',
+ 'p_entity_id' =>
$this->entity_id,
+ 'p_cat_id'
=> $this->cat_id,
+ 'type'
=> $this->type,
+ 'target'
=> '_blank',
+ 'bypass'
=> true,
+ 'origin'
=> ".{$this->type}.{$this->entity_id}.{$this->cat_id}",
)),
'parameters'
=> $parameters2
);
}
+
$jasper = execMethod('property.sojasper.read',
array('location_id' =>
$GLOBALS['phpgw']->locations->get_id($this->type_app[$this->type],
$this->acl_location)));
foreach ($jasper as $report)
@@ -890,18 +904,26 @@
'type' => $this->type
);
+ $img_types = array
+ (
+ 'image/jpeg',
+ 'image/png',
+ 'image/gif'
+ );
+
$content_files = array();
+
for($z=0; $z<count($values['files']); $z++)
{
- $content_files[$z]['file_name'] = '<a
href="'.$GLOBALS['phpgw']->link('/index.php',$link_file_data).'&file_name='.$values['files'][$z]['name'].'"
target="_blank" title="'.lang('click to view
file').'">'.$values['files'][$z]['name'].'</a>';
- if($mode == 'edit')
+ $content_files[$z]['url'] = '<a
href="'.$GLOBALS['phpgw']->link('/index.php',$link_file_data).'&file_name='.$values['files'][$z]['name'].'"
target="_blank" title="'.lang('click to view
file').'">'.$values['files'][$z]['name'].'</a>';
+ $content_files[$z]['file_name'] =
$values['files'][$z]['name'];
+
+ if(in_array($values['files'][$z]['mime_type'],
$img_types))
{
- $content_files[$z]['delete_file'] =
'<input type="checkbox" name="values[file_action][]"
value="'.$values['files'][$z]['name'].'" title="'.lang('Check to delete
file').'">';
+ $content_files[$z]['file_name'] =
urlencode($values['files'][$z]['name']);
+ $content_files[$z]['directory'] =
urlencode($values['files'][$z]['directory']);
+ $content_files[$z]['img_id'] =
$values['files'][$z]['file_id'];
}
- else
- {
- $content_files[$z]['delete_file'] = '';
- }
}
$datavalues[0] = array
@@ -917,10 +939,14 @@
$myColumnDefs[0] = array
(
'name' => "0",
- 'values' =>
json_encode(array( array('key' =>
'file_name','label'=>lang('Filename'),'sortable'=>false,'resizeable'=>true),
- array('key' =>
'delete_file','label'=>lang('Delete
file'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterCenter')))
+ 'values' =>
json_encode(array( array('key' =>
'url','label'=>lang('Filename'),'sortable'=>false,'resizeable'=>true),
+
array('key' => 'file_name','hidden'=>true),
+
array('key' => 'img_id','hidden'=>true),
+
array('key' => 'directory','hidden'=>true),
+
array('key' =>
'picture','label'=>'picture','sortable'=>false,'resizeable'=>false,'visible'=>true,'formatter'=>'show_picture')))
);
+
$msglog =
phpgwapi_cache::session_get('frontend','msgbox');
phpgwapi_cache::session_clear('frontend','msgbox');
@@ -943,10 +969,22 @@
'location_data' =>
$location_data,
'files'
=> isset($values['files'])?$values['files']:'',
'property_js' =>
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
+ 'base_java_url' =>
"{menuaction:'property.uientity.get_files',".
+
"id:'{$id}',".
+
"entity_id:'{$this->entity_id}',".
+
"cat_id:'{$this->cat_id}',".
+
"type:'{$this->type}'}",
'datatable'
=> $datavalues,
'myColumnDefs' =>
$myColumnDefs,
)
);
+ phpgwapi_yui::load_widget('dragdrop');
+ phpgwapi_yui::load_widget('datatable');
+ phpgwapi_yui::load_widget('connection');
+ phpgwapi_yui::load_widget('loader');
+ phpgwapi_yui::load_widget('animation');
+ $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'entity.view', 'frontend' );
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/datatable/assets/skins/sam/datatable.css');
$GLOBALS['phpgw']->xslttpl->add_file(array('frontend',
'entityview','attributes_view'));
Modified: branches/dev-thomasez/frontend/templates/base/attributes_view.xsl
===================================================================
--- branches/dev-thomasez/frontend/templates/base/attributes_view.xsl
2011-06-28 11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/frontend/templates/base/attributes_view.xsl
2011-06-28 11:07:59 UTC (rev 7444)
@@ -26,7 +26,7 @@
</a>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of
select="input_text"/>
+ <b><xsl:value-of
select="input_text"/></b>
</xsl:otherwise>
</xsl:choose>
<xsl:choose>
@@ -48,12 +48,6 @@
<li>
<xsl:choose>
<xsl:when test="name!=''">
- <input type="hidden"
name="values_attribute[{counter}][name]" value="{name}"></input>
- <input type="hidden"
name="values_attribute[{counter}][datatype]" value="{datatype}"></input>
- <input type="hidden"
name="values_attribute[{counter}][history]" value="{history}"></input>
- <input type="hidden"
name="values_attribute[{counter}][attrib_id]" value="{id}"></input>
- <input type="hidden"
name="values_attribute[{counter}][nullable]" value="{nullable}"></input>
- <input type="hidden"
name="values_attribute[{counter}][input_text]" value="{input_text}"></input>
<xsl:choose>
<xsl:when
test="datatype='R'">
<xsl:call-template name="choice"/>
@@ -62,61 +56,22 @@
<xsl:call-template name="choice"/>
</xsl:when>
<xsl:when
test="datatype='LB'">
- <select
name="values_attribute[{counter}][value]" class="forms">
-
<xsl:choose>
-
<xsl:when test="disabled!=''">
-
<xsl:attribute name="disabled">
-
<xsl:text> disabled</xsl:text>
-
</xsl:attribute>
-
</xsl:when>
-
</xsl:choose>
-
<option value=""><xsl:value-of select="//lang_none"/></option>
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
<xsl:for-each select="choice">
-
<xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
<xsl:choose>
<xsl:when test="checked='checked'">
-
<option value="{$id}" selected="selected"><xsl:value-of
disable-output-escaping="yes" select="value"/></option>
+
<xsl:value-of disable-output-escaping="yes"
select="value"/>
</xsl:when>
-
<xsl:otherwise>
-
<option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="value"/></option>
-
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
-
</select>
</xsl:when>
<xsl:when
test="datatype='AB'">
<table>
<ul>
<li>
-
<xsl:variable name="contact_name"><xsl:value-of
select="name"/><xsl:text>_name</xsl:text></xsl:variable>
-
<xsl:variable
name="lookup_function"><xsl:text>lookup_</xsl:text><xsl:value-of
select="name"/><xsl:text>();</xsl:text></xsl:variable>
-
<xsl:variable
name="clear_function"><xsl:text>clear_</xsl:text><xsl:value-of
select="name"/><xsl:text>();</xsl:text></xsl:variable>
-
<input type="hidden" name="{name}" value="{value}"
onClick="{$lookup_function}" readonly="readonly" size="5">
-
<xsl:choose>
-
<xsl:when test="disabled!=''">
-
<xsl:attribute name="disabled">
-
<xsl:text> disabled</xsl:text>
-
</xsl:attribute>
-
</xsl:when>
-
</xsl:choose>
-
</input>
-
<input size="30" type="text" name="{$contact_name}"
value="{contact_name}" onClick="{$lookup_function}" readonly="readonly">
-
<xsl:choose>
-
<xsl:when test="disabled!=''">
-
<xsl:attribute name="disabled">
-
<xsl:text> disabled</xsl:text>
-
</xsl:attribute>
-
</xsl:when>
-
</xsl:choose>
-
</input>
-
<input type="checkbox" name="clear_{name}_box"
onClick="{$clear_function}" >
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang',
'delete')" />
-
</xsl:attribute>
-
<xsl:attribute name="readonly">
-
<xsl:text>readonly</xsl:text>
-
</xsl:attribute>
-
</input>
+
<xsl:value-of select="contact_name"/>
</li>
</ul>
<xsl:choose>
@@ -245,16 +200,7 @@
<img
id="values_attribute_{counter}-trigger" src="{img_cal}" alt="{lang_datetitle}"
title="{lang_datetitle}" style="cursor:pointer; cursor:hand;" />
</xsl:when>
<xsl:when
test="datatype='T'">
-
<textarea cols="{//textareacols}" rows="{//textarearows}"
name="values_attribute[{counter}][value]" >
-
<xsl:choose>
-
<xsl:when test="disabled!=''">
-
<xsl:attribute name="disabled">
-
<xsl:text> disabled</xsl:text>
-
</xsl:attribute>
-
</xsl:when>
-
</xsl:choose>
-
<xsl:value-of select="value"/>
-
</textarea>
+
<xsl:value-of select="value"/>
</xsl:when>
<xsl:when
test="datatype='pwd'">
<table>
@@ -359,15 +305,7 @@
</xsl:choose>
</xsl:when>
<xsl:otherwise>
- <input
type="text" name="values_attribute[{counter}][value]" value="{value}" size="30">
-
<xsl:choose>
-
<xsl:when test="disabled!=''">
-
<xsl:attribute name="disabled">
-
<xsl:text> disabled</xsl:text>
-
</xsl:attribute>
-
</xsl:when>
-
</xsl:choose>
- </input>
+
<xsl:value-of select="value"/>
</xsl:otherwise>
</xsl:choose>
<xsl:choose>
Modified: branches/dev-thomasez/frontend/templates/base/entityview.xsl
===================================================================
--- branches/dev-thomasez/frontend/templates/base/entityview.xsl
2011-06-28 11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/frontend/templates/base/entityview.xsl
2011-06-28 11:07:59 UTC (rev 7444)
@@ -1,5 +1,28 @@
<xsl:template match="entityinfo" xmlns:php="http://php.net/xsl";>
+ <script type="text/javascript">
+ var property_js = <xsl:value-of select="property_js" />;
+ var base_java_url = <xsl:value-of select="base_java_url" />;
+ var datatable = new Array();
+ var myColumnDefs = new Array();
+
+ <xsl:for-each select="datatable">
+ datatable[<xsl:value-of select="name"/>] = [
+ {
+ values : <xsl:value-of
select="values"/>,
+ total_records : <xsl:value-of
select="total_records"/>,
+ edit_action : <xsl:value-of
select="edit_action"/>,
+ is_paginator : <xsl:value-of
select="is_paginator"/>,
+ footer : <xsl:value-of
select="footer"/>
+ }
+ ]
+ </xsl:for-each>
+
+ <xsl:for-each select="myColumnDefs">
+ myColumnDefs[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
+ </xsl:for-each>
+ </script>
+
<table cellpadding="2" cellspacing="2" width="95%" align="center">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
@@ -22,6 +45,9 @@
<li>
<xsl:choose>
<xsl:when
test="location_data!=''">
+ <li>
+
<b><xsl:value-of select="php:function('lang', 'location')"/></b>
+ </li>
<div
id="location">
<table>
<xsl:call-template name="location_view"/>
@@ -37,17 +63,7 @@
<xsl:choose>
<xsl:when test="files!=''">
<li>
- <table
cellpadding="2" cellspacing="2" width="80%" align="center">
- <!--
<xsl:call-template name="file_list"/> -->
- <tr>
-
<td align="left" valign="top">
-
<xsl:value-of select="php:function('lang', 'files')"/>
-
</td>
-
<td>
-
<div id="datatable-container_0"></div>
-
</td>
- </tr>
- </table>
+ <div
id="datatable-container_0"></div>
</li>
</xsl:when>
</xsl:choose>
Modified: branches/dev-thomasez/property/inc/class.boentity.inc.php
===================================================================
--- branches/dev-thomasez/property/inc/class.boentity.inc.php 2011-06-28
11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/property/inc/class.boentity.inc.php 2011-06-28
11:07:59 UTC (rev 7444)
@@ -452,9 +452,12 @@
else
{
$values['files'][] = array
- (
- 'name' =>
$file['name']
- );
+ (
+ 'name' =>
$file['name'],
+ 'directory' =>
$file['directory'],
+ 'file_id' =>
$file['file_id'],
+ 'mime_type' =>
$file['mime_type']
+ );
}
}
Modified: branches/dev-thomasez/property/inc/class.soadmin_location.inc.php
===================================================================
--- branches/dev-thomasez/property/inc/class.soadmin_location.inc.php
2011-06-28 11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/property/inc/class.soadmin_location.inc.php
2011-06-28 11:07:59 UTC (rev 7444)
@@ -183,7 +183,8 @@
'name' =>
$this->db->f('name'),
'descr' =>
$this->db->f('descr'),
'list_info' =>
$this->db->f('list_info',true),
- 'list_address' =>
$this->db->f('list_address')
+ 'list_address' =>
$this->db->f('list_address'),
+ 'list_documents'=>
$this->db->f('list_documents')
);
}
return $standard;
@@ -363,7 +364,7 @@
$fd['part_of_town_id'] = array('type' => 'int',
'precision' => 2, 'nullable' => true);
}
- $fd['loc' .$standard['id'] . '_name'] = array('type' =>
'varchar', 'precision' => 25, 'nullable' => true);
+ $fd['loc' .$standard['id'] . '_name'] = array('type' =>
'varchar', 'precision' => 50, 'nullable' => true);
$fd['entry_date'] = array('type' => 'int', 'precision'
=> 4, 'nullable' => true);
$fd['category'] = array('type' => 'int', 'precision' =>
4, 'nullable' => true);
$fd['user_id'] = array('type' => 'int', 'precision' =>
4, 'nullable' => true);
@@ -499,7 +500,8 @@
'descr' =>
$this->db->db_addslashes($values['descr']),
'list_info' =>
(isset($values['list_info'])?serialize($values['list_info']):''),
'list_address' =>
(isset($values['list_address'])?$values['list_address']:''),
- );
+ 'list_documents'=>
(isset($values['list_documents'])?$values['list_documents']:''),
+ );
$value_set =
$this->db->validate_update($value_set);
@@ -668,7 +670,8 @@
'name' =>
stripslashes($this->db->f('name')),
'descr' =>
stripslashes($this->db->f('descr')),
'list_info' =>
unserialize($this->db->f('list_info')),
- 'list_address' =>
$this->db->f('list_address')
+ 'list_address' =>
$this->db->f('list_address'),
+ 'list_documents'=>
$this->db->f('list_documents')
);
}
//_debug_array($location_type);
Modified: branches/dev-thomasez/property/inc/class.solocation.inc.php
===================================================================
--- branches/dev-thomasez/property/inc/class.solocation.inc.php 2011-06-28
11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/property/inc/class.solocation.inc.php 2011-06-28
11:07:59 UTC (rev 7444)
@@ -248,16 +248,15 @@
return $owners;
}
- function check_location($location_code='',$type_id='')
+ function check_location($location_code, $type_id = 0)
{
- $this->db->query("SELECT count(*) AS cnt FROM
fm_location$type_id where location_code='$location_code'");
-
- $this->db->next_record();
-
- if ( $this->db->f('cnt'))
+ if(!$type_id)
{
- return true;
+ $type_id = count(explode('-',$location_code));
}
+ $this->db->query("SELECT location_code FROM
fm_location{$type_id} WHERE location_code='{$location_code}'");
+
+ return $this->db->next_record();
}
function read($data)
Modified: branches/dev-thomasez/property/inc/class.uiadmin_location.inc.php
===================================================================
--- branches/dev-thomasez/property/inc/class.uiadmin_location.inc.php
2011-06-28 11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/property/inc/class.uiadmin_location.inc.php
2011-06-28 11:07:59 UTC (rev 7444)
@@ -534,10 +534,9 @@
'lang_select'
=> lang('select'),
'value_list_info'
=> $this->bo->get_list_info((isset($id)?$id:''),$values['list_info']),
'lang_location'
=> lang('location'),
- 'lang_list_address'
=> lang('list address'),
'lang_list_info_statustext'
=> lang('Names of levels to list at this level'),
- 'lang_list_address_statustext' =>
lang('List address at this level'),
- 'value_list_address'
=> (isset($values['list_address'])?$values['list_address']:'')
+ 'value_list_address'
=> isset($values['list_address'])?$values['list_address']:'',
+ 'value_list_documents'
=> isset($values['list_documents'])?$values['list_documents']:''
);
$appname = lang('location');
Modified: branches/dev-thomasez/property/inc/class.uientity.inc.php
===================================================================
--- branches/dev-thomasez/property/inc/class.uientity.inc.php 2011-06-28
11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/property/inc/class.uientity.inc.php 2011-06-28
11:07:59 UTC (rev 7444)
@@ -1572,13 +1572,6 @@
//
$GLOBALS['phpgw']->js->validate_file('overlib','overlib','property');
- $table_apply[] = array
- (
- 'lang_save'
=> lang('save'),
- 'lang_cancel'
=> lang('cancel'),
- 'lang_apply'
=> lang('apply'),
- );
-
$pdf_data = array
(
'menuaction' =>
'property.uientity.print_pdf',
@@ -1992,14 +1985,11 @@
'value_id'
=> $values['id'],
'value_num'
=> $values['num'],
'error_flag'
=> isset($error_id)?$error_id:'',
- 'lang_done_statustext'
=> lang('Back to the list'),
- 'lang_save_statustext'
=> lang('Save the entity'),
'lang_history'
=> lang('history'),
'lang_history_help'
=> lang('history of this attribute'),
'lang_history_date_statustext' =>
lang('Enter the date for this reading'),
'lang_date'
=> lang('date'),
- 'table_apply'
=> $table_apply,
'textareacols'
=>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'] ?
$GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'] : 40,
'textarearows'
=>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] ?
$GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] : 6,
'tabs'
=> phpgwapi_yui::tabview_generate($tabs, $active_tab),
Modified: branches/dev-thomasez/property/inc/class.uigallery.inc.php
===================================================================
--- branches/dev-thomasez/property/inc/class.uigallery.inc.php 2011-06-28
11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/property/inc/class.uigallery.inc.php 2011-06-28
11:07:59 UTC (rev 7444)
@@ -126,10 +126,16 @@
return false;
}
- if($thumb && is_file($thumbfile))
+ $re_create= false;
+ if($this->is_image($source) && $thumb && $re_create)
{
+
$this->create_thumb($source,$thumbfile,$thumb_size = 100);
readfile($thumbfile);
}
+ else if($thumb && is_file($thumbfile))
+ {
+ readfile($thumbfile);
+ }
else if($this->is_image($source) && $thumb)
{
$this->create_thumb($source,$thumbfile,$thumb_size = 100);
@@ -141,12 +147,14 @@
}
}
- function create_thumb($source,$dest,$thumb_size = 100)
+ function create_thumb($source,$dest,$target_height = 100)
{
$size = getimagesize($source);
$width = $size[0];
$height = $size[1];
+ $target_width = round($width*($target_height/$height));
+
if ($width > $height)
{
$x = ceil(($width - $height) / 2 );
@@ -158,26 +166,26 @@
$height = $width;
}
- $new_im = ImageCreatetruecolor($thumb_size,$thumb_size);
+ $new_im =
ImageCreatetruecolor($target_width,$target_height);
@$imgInfo = getimagesize($source);
if ($imgInfo[2] == IMAGETYPE_JPEG)
{
$im = imagecreatefromjpeg($source);
-
imagecopyresampled($new_im,$im,0,0,$x,$y,$thumb_size,$thumb_size,$width,$height);
+
imagecopyresampled($new_im,$im,0,0,$x,$y,$target_width,$target_height,$width,$height);
imagejpeg($new_im,$dest,75); // Thumbnail
quality (Value from 1 to 100)
}
else if ($imgInfo[2] == IMAGETYPE_GIF)
{
$im = imagecreatefromgif($source);
-
imagecopyresampled($new_im,$im,0,0,$x,$y,$thumb_size,$thumb_size,$width,$height);
+
imagecopyresampled($new_im,$im,0,0,$x,$y,$target_width,$target_height,$width,$height);
imagegif($new_im,$dest);
}
else if ($imgInfo[2] == IMAGETYPE_PNG)
{
$im = imagecreatefrompng($source);
-
imagecopyresampled($new_im,$im,0,0,$x,$y,$thumb_size,$thumb_size,$width,$height);
+
imagecopyresampled($new_im,$im,0,0,$x,$y,$target_width,$target_height,$width,$height);
imagepng($new_im,$dest);
}
}
Modified: branches/dev-thomasez/property/inc/class.uiimport.inc.php
===================================================================
--- branches/dev-thomasez/property/inc/class.uiimport.inc.php 2011-06-28
11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/property/inc/class.uiimport.inc.php 2011-06-28
11:07:59 UTC (rev 7444)
@@ -30,7 +30,15 @@
public function __construct()
{
- set_time_limit(10000); //Set the time limit for this
request oto 3000 seconds
+ if ( !$GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin')
+ && !$GLOBALS['phpgw']->acl->check('admin',
phpgwapi_acl::ADD, 'property'))
+ {
+ $GLOBALS['phpgw_info']['flags']['xslt_app'] =
true;
+ execMethod('property.bocommon.no_access');
+ }
+
+ set_time_limit(10000);
+// $GLOBALS['phpgw']->common->phpgw_header(true);
$this->account =
(int)$GLOBALS['phpgw_info']['user']['account_id'];
$this->db = & $GLOBALS['phpgw']->db;
}
@@ -91,11 +99,11 @@
}
$result = $this->import(); // Do import step,
result determines if finished for this area
- echo '<li class="info">Aktiviteter: finished
step ' .$result. '</li>';
+ echo '<li class="info">Import: finished step '
.$result. '</li>';
while($result != '1')
{
$result = $this->import();
- echo '<li class="info">Aktiviteter:
finished step ' .$result. '</li>';
+ echo '<li class="info">Import: finished
step ' .$result. '</li>';
flush();
}
Modified: branches/dev-thomasez/property/inc/class.uilocation.inc.php
===================================================================
--- branches/dev-thomasez/property/inc/class.uilocation.inc.php 2011-06-28
11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/property/inc/class.uilocation.inc.php 2011-06-28
11:07:59 UTC (rev 7444)
@@ -239,7 +239,7 @@
foreach ($_config as $_config_section =>
$_config_section_data)
{
$integrationurl = '';
- if(isset($_config_section_data['url']))
+ if(isset($_config_section_data['url']) &&
!isset($_config_section_data['tab']))
{
if(isset($_config_section_data['auth_hash_name']) &&
$_config_section_data['auth_hash_name'] &&
isset($_config_section_data['auth_url']) && $_config_section_data['auth_url'])
{
@@ -2189,8 +2189,13 @@
$related =
$this->bo->read_entity_to_link($location_code);
$related_link = array();
- $document = CreateObject('property.sodocument');
- $documents = $document->get_files_at_location(
array('location_code' => $location_code) );
+ $location_type_info =
$this->soadmin_location->read_single($type_id);
+ $documents = array();
+ if($location_type_info['list_documents'])
+ {
+ $document =
CreateObject('property.sodocument');
+ $documents =
$document->get_files_at_location( array('location_code' => $location_code) );
+ }
if($documents)
{
Modified: branches/dev-thomasez/property/inc/class.uitts.inc.php
===================================================================
--- branches/dev-thomasez/property/inc/class.uitts.inc.php 2011-06-28
11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/property/inc/class.uitts.inc.php 2011-06-28
11:07:59 UTC (rev 7444)
@@ -1836,7 +1836,7 @@
}
//--------------end files
$GLOBALS['phpgw']->session->appsession('receipt','property',$receipt);
-
$GLOBALS['phpgw']->session->appsession('session_data','fm_tts','');
+ //
$GLOBALS['phpgw']->session->appsession('session_data','fm_tts','');
if ((isset($values['save']) &&
$values['save']))
{
@@ -1875,8 +1875,10 @@
'entity_data' =>
(isset($values['p'])?$values['p']:'')
));
-
-// $ticket['contact_id'] =
$GLOBALS['phpgw']->accounts->get($this->account)->person_id;
+ if
(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_me_as_contact'])
&&
$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_me_as_contact']==1)
+ {
+ $ticket['contact_id'] =
$GLOBALS['phpgw']->accounts->get($this->account)->person_id;
+ }
$contact_data=$this->bocommon->initiate_ui_contact_lookup(array(
'contact_id' =>
$ticket['contact_id'],
'field' => 'contact',
@@ -2059,7 +2061,7 @@
{
$receipt = $this->bo->add($values);
$GLOBALS['phpgw']->session->appsession('receipt','property',$receipt);
-
$GLOBALS['phpgw']->session->appsession('session_data','fm_tts','');
+ //
$GLOBALS['phpgw']->session->appsession('session_data','fm_tts','');
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uitts.index'));
}
else
Property changes on: branches/dev-thomasez/property/inc/cron/cron.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/cron/default/Import_fra_basware_X205.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/cron/default/export_info_as_files.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/cron/default/forward_mail_as_sms.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/cron/default/import_files.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/cron/default/import_from_scanner.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/cron/default/lag_lang_filer.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/cron/default/oppdater_antall_leieobjekt.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/cron/default/oppdater_namssakstatus_pr_leietaker.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/cron/default/oppdater_utgaatt_objekt.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/cron/default/organize_drawing.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/cron/default/synkroniser_med_boei.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/cron/default/update_googlemap.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/cron/default/update_phpgw.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/cron/default/update_workorder_status.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/custom/default/estimert_ferdigdato_til_leieobjekt_BBB.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/custom/default/hent_maaler_nr_til_besikt_rapport.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/custom/default/innflyttetdato_entity_2_11_BBB.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/custom/default/kalkuler_risiko_for_ros.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/dev-thomasez/property/inc/export/default/Agresso
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/dev-thomasez/property/inc/export/default/Ecolink
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/dev-thomasez/property/inc/export/default/GABNr
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/export/default/Kemner_kvittering
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: branches/dev-thomasez/property/inc/hook_settings.inc.php
===================================================================
--- branches/dev-thomasez/property/inc/hook_settings.inc.php 2011-06-28
11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/property/inc/hook_settings.inc.php 2011-06-28
11:07:59 UTC (rev 7444)
@@ -185,6 +185,8 @@
create_select_box('Send e-mail from
TTS','tts_user_mailnotification',$yes_and_no,'Send e-mail from TTS as default');
create_input_box('Refresh TTS every (seconds)','refreshinterval','The
intervall for Helpdesk refresh - cheking for new tickets');
+ create_select_box('Set myself as contact when adding a
ticket','tts_me_as_contact',$yes_and_no,'');
+
create_select_box('Default Degree Request
safety','default_safety',$degree,'The degree of seriousness');
create_select_box('Default Degree Request
aesthetics','default_aesthetics',$degree);
create_select_box('Default Degree Request indoor
climate','default_climate',$degree);
Property changes on:
branches/dev-thomasez/property/inc/import/default/Import_fra_BKK
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/import/default/Import_fra_BKK_csv
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/import/default/Import_fra_Kemner
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/import/default/Import_fra_Kemner_xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/import/default/Import_fra_Service
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/property/inc/import/default/Import_fra_Service_xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified:
branches/dev-thomasez/property/inc/import/default/cvs_import_kunstoversikt_bkb
===================================================================
---
branches/dev-thomasez/property/inc/import/default/cvs_import_kunstoversikt_bkb
2011-06-28 11:06:25 UTC (rev 7443)
+++
branches/dev-thomasez/property/inc/import/default/cvs_import_kunstoversikt_bkb
2011-06-28 11:07:59 UTC (rev 7444)
@@ -55,12 +55,6 @@
$id = (int)$data[2];
- $this->db->query("SELECT id FROM {$table} WHERE id =
{$id}",__LINE__,__FILE__);
- if($this->db->next_record())
- {
- $this->errors[] = "ID finnes fra før: {$id}";
- return true;
- }
$this->messages[] = "Dagens dato er lagt inn som
registreringsdato for {$id} (mangler info)";
$entry_date = time();
@@ -69,7 +63,7 @@
//_debug_array($entry_date);
$value_set = array();
- $value_set['id']
= $id;
+
$value_set['num']
= sprintf('%04s',$id);
$value_set['loc1'] =
$location_data['loc1'];
$value_set['loc2'] =
$location_data['loc2'];
@@ -82,10 +76,21 @@
$value_set['beskrivelse'] =
$this->db->db_addslashes($data[4]);
$value_set['tilstand'] =
$this->db->db_addslashes($data[5]);
- $cols = implode(',', array_keys($value_set));
- $values =
$this->db->validate_insert(array_values($value_set));
+ $this->db->query("SELECT id FROM {$table} WHERE id =
{$id}",__LINE__,__FILE__);
+ if($this->db->next_record())
+ {
+ $this->warnings[] = "ID finnes fra før: {$id},
oppdaterer";
+ $value_set =
$this->db->validate_update($value_set);
+ $sql = "UPDATE {$table} SET {$value_set} WHERE
id = {$id}";
+ }
+ else
+ {
+ $value_set['id'] = $id;
+ $cols = implode(',', array_keys($value_set));
+ $values =
$this->db->validate_insert(array_values($value_set));
- $sql = "INSERT INTO {$table} ({$cols}) VALUES
({$values})";
+ $sql = "INSERT INTO {$table} ({$cols}) VALUES
({$values})";
+ }
if($debug)
{
Copied:
branches/dev-thomasez/property/inc/import/default/cvs_import_romdata_bkb (from
rev 7440, trunk/property/inc/import/default/cvs_import_romdata_bkb)
===================================================================
--- branches/dev-thomasez/property/inc/import/default/cvs_import_romdata_bkb
(rev 0)
+++ branches/dev-thomasez/property/inc/import/default/cvs_import_romdata_bkb
2011-06-28 11:07:59 UTC (rev 7444)
@@ -0,0 +1,200 @@
+<?php
+ class import_conversion
+ {
+ protected $db;
+ public $messages = array();
+ public $warnings = array();
+ public $errors = array();
+ protected $debug = false;
+
+ public function __construct()
+ {
+ set_time_limit(10000); //Set the time limit for this
request
+ $this->account =
(int)$GLOBALS['phpgw_info']['user']['account_id'];
+ $this->db = & $GLOBALS['phpgw']->db;
+ $this->solocation =
CreateObject('property.solocation');
+ }
+
+ public function add($data)
+ {
+ $location_code = $this->decode($data[0]);
+ if(!$location_code)
+ {
+ $this->errors[] = "Mangler objekt, hopper over:
{$data[1]}";
+ return false;
+ }
+
+ $location_arr = explode('-',$location_code);
+ $_test_floor =
"{$location_arr[0]}-{$location_arr[1]}-{$location_arr[2]}";
+ $_test_zone =
"{$location_arr[0]}-{$location_arr[1]}-{$location_arr[2]}-{$location_arr[3]}";
+
+ $ok = true;
+ if(!$this->solocation->check_location($_test_floor))
+ {
+ $_ok =
$this->add_location(array('location_code' => $_test_floor, 'name' => "etasje
{{$location_arr[2]}}", 'area' => 0));
+ $ok = $_ok ? $_ok : false;
+ }
+
+ if(!$this->solocation->check_location($_test_zone))
+ {
+ $_ok =
$this->add_location(array('location_code' => $_test_zone, 'name' => "sone
{{$location_arr[3]}}", 'area' => 0));
+ $ok = $_ok && $ok ? $_ok : false;
+ }
+
+ if(!$this->solocation->check_location($location_code))
+ {
+ $_ok =
$this->add_location(array('location_code' => $location_code, 'name' =>
$this->decode($data[6]), 'area' => $this->decode($data[7])));
+ $ok = $_ok && $ok ? $_ok : false;
+ }
+ else
+ {
+ $this->warnings[] = "location_code finnes fra
før: {$location_code}, oppdaterer";
+ $_ok =
$this->update_location(array('location_code' => $location_code, 'name' =>
$this->decode($data[6]), 'area' => $this->decode($data[7])));
+ $ok = $_ok && $ok ? $_ok : false;
+ }
+
+ return $ok;
+ }
+
+ protected function add_location($data)
+ {
+ $debug = $this->debug;
+ $error = false;
+ $ok = true;
+ $value_set = array();
+
+ $location_arr = explode('-',$data['location_code']);
+ $type_id = count($location_arr);
+
+ $formatting = array
+ (
+ '%04s',
+ '%02s',
+ '%02s',
+ '%02s',
+ '%03s'
+ );
+
+ $value_set['location_code'] =
$data['location_code'];
+ foreach ($location_arr as $_key => $_loc)
+ {
+ $i = $_key +1;
+ $value_set["loc{$i}"] =
sprintf($formatting[$_key],$location_arr[$_key]);
+ }
+
+ $value_set["loc{$type_id}_name"] =
$this->db->db_addslashes($data['name']);
+ $value_set['category'] = 1;
+ $value_set['user_id'] =
$this->account;
+ $value_set['entry_date'] =
time();
+ $value_set['area_net'] =
$data['area'] ? str_replace(',','.',$data['area']) : 0;
+ $value_set['merknader'] =
'Opprettet fra tegning: ' . date('d/m/Y');
+
+ $cols = implode(',', array_keys($value_set));
+ $values =
$this->db->validate_insert(array_values($value_set));
+
+ $table = "fm_location{$type_id}";
+
+ $sql = "INSERT INTO {$table} ({$cols}) VALUES
({$values})";
+
+ $sql2 = "INSERT INTO fm_locations (level,
location_code) VALUES ({$type_id}, '{$data['location_code']}')";
+
+ if($debug)
+ {
+ _debug_array($sql);
+ }
+ else
+ {
+ $_ok = $this->db->query($sql,__LINE__,__FILE__);
+ $ok = $_ok ? $_ok : false;
+ $_ok =
$this->db->query($sql2,__LINE__,__FILE__);
+ $ok = $_ok ? $_ok : false;
+ }
+
+ if(!$error && $ok)
+ {
+ $this->messages[] = "Successfully imported
location: {$data['location_code']}";
+ }
+ else
+ {
+ $this->errors[] = "Error importing location:
{$data['location_code']}";
+ }
+ return $ok;
+ }
+
+ protected function update_location($data)
+ {
+ $debug = $this->debug;
+ $ok = false;
+ $value_set = array();
+
+ $location_arr = explode('-',$data['location_code']);
+ $type_id = count($location_arr);
+ $table = "fm_location{$type_id}";
+
+ $value_set["loc{$type_id}_name"] =
$this->db->db_addslashes($data['name']);
+ $value_set['area_net'] =
$data['area'] ? str_replace(',','.',$data['area']) : 0;
+
+ $this->db->query("SELECT merknader FROM {$table} WHERE
location_code = '{$data['location_code']}'",__LINE__,__FILE__);
+ $this->db->next_record();
+
+ $merknader = $this->db->f('merknader',true);
+
+ $value_set['merknader'] = '';
+ if($merknader)
+ {
+ $value_set['merknader'] = "{$merknader}\n";
+ }
+ $value_set['merknader'] .=
"Oppdatert fra tegning: " . date('d/m/Y');
+
+ $value_set =
$this->db->validate_update($value_set);
+ $sql = "UPDATE {$table} SET {$value_set} WHERE
location_code = '{$data['location_code']}'";
+
+ if($debug)
+ {
+ _debug_array($sql);
+ $ok = true;
+ }
+ else
+ {
+ $ok = $this->db->query($sql,__LINE__,__FILE__);
+ }
+
+ if($ok)
+ {
+ $this->messages[] = "Successfully updated
location: {$data['location_code']}";
+ }
+ else
+ {
+ $this->errors[] = "Error update location:
{$data['location_code']}";
+ }
+ return $ok;
+ }
+
+ /**
+ * Convert from the locale encoding to UTF-8 encoding and
escape single quotes
+ *
+ * @param string $value The value to convert
+ * @return string
+ */
+ protected function decode($value)
+ {
+ $converted = $value;// mb_convert_encoding($value,
'UTF-8');
+ if ($this->is_null(trim($converted)))
+ {
+ return null;
+ }
+ return stripslashes($converted);
+ }
+
+ /**
+ * Test a value for null according to several formats that can
exist in the export.
+ * Returns true if the value is null according to these rules,
false otherwise.
+ *
+ * @param string $value The value to test
+ * @return bool
+ */
+ protected function is_null($value)
+ {
+ return ((trim($value) == "") || ($data == "<NULL>") ||
($data == "''"));
+ }
+ }
Property changes on:
branches/dev-thomasez/property/inc/import/default/import_fra_Service_xls
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: branches/dev-thomasez/property/setup/phpgw_no.lang
===================================================================
--- branches/dev-thomasez/property/setup/phpgw_no.lang 2011-06-28 11:06:25 UTC
(rev 7443)
+++ branches/dev-thomasez/property/setup/phpgw_no.lang 2011-06-28 11:07:59 UTC
(rev 7444)
@@ -166,6 +166,8 @@
apartment id property no leilighet ID
applications property no Applikasjoner
apply the values property no Bruke verdier
+apply property no Mellomlagre
+save and stay in form property no Lagre og bli stående i skjemaet
approval property no Godkjenning
approvals property no Godkjenninger
approvals request property no Anmodninger om godkjenning
@@ -1355,6 +1357,7 @@
save the voucher property no lagre bilag
save the workorder property no lagre bestilling
save this workorder as a template for later use property no
lagre denne bestillingen som mal for senere bruk
+save values and exit property no Lagre verdier og gå til liste
scale property no Scale
schedule property no planlegge (tid)
scheduled events property no Planlagte oppgaver
Modified: branches/dev-thomasez/property/setup/setup.inc.php
===================================================================
--- branches/dev-thomasez/property/setup/setup.inc.php 2011-06-28 11:06:25 UTC
(rev 7443)
+++ branches/dev-thomasez/property/setup/setup.inc.php 2011-06-28 11:07:59 UTC
(rev 7444)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.618';
+ $setup_info['property']['version'] = '0.9.17.619';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Modified: branches/dev-thomasez/property/setup/tables_current.inc.php
===================================================================
--- branches/dev-thomasez/property/setup/tables_current.inc.php 2011-06-28
11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/property/setup/tables_current.inc.php 2011-06-28
11:07:59 UTC (rev 7444)
@@ -149,6 +149,7 @@
'uc' => array('type' => 'text','nullable' =>
True),
'list_info' => array('type' =>
'varchar','precision' => '255','nullable' => True),
'list_address' => array('type' =>
'int','precision' => '2','nullable' => True),
+ 'list_documents' => array('type' =>
'int','precision' => '2','nullable' => True),
),
'pk' => array('id'),
'fk' => array(),
Modified: branches/dev-thomasez/property/setup/tables_update.inc.php
===================================================================
--- branches/dev-thomasez/property/setup/tables_update.inc.php 2011-06-28
11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/property/setup/tables_update.inc.php 2011-06-28
11:07:59 UTC (rev 7444)
@@ -5282,7 +5282,35 @@
}
}
+
/**
+ * Update property version from 0.9.17.618 to 0.9.17.619
+ */
+
+ $test[] = '0.9.17.618';
+ function property_upgrade0_9_17_618()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_location_type','list_documents',
array('type' => 'int','precision' => '2','nullable' => True));
+ $GLOBALS['phpgw_setup']->oProc->query("UPDATE fm_location_type
SET list_documents = 1");
+
+ $GLOBALS['phpgw_setup']->oProc->query("SELECT count(*) as cnt
FROM fm_location_type");
+ $GLOBALS['phpgw_setup']->oProc->next_record();
+ $locations = $GLOBALS['phpgw_setup']->oProc->f('cnt') +1;
+ for ($level = 5; $level < $locations; $level++)
+ {
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn("fm_location{$level}",
"loc{$level}_name",array('type' => 'varchar','precision' => '50','nullable' =>
True));
+ }
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.619';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
+
+
+ /**
* Update property version from 0.9.17.607 to 0.9.17.608
* Add more room for address at tickets
*
Modified: branches/dev-thomasez/property/templates/base/admin_location.xsl
===================================================================
--- branches/dev-thomasez/property/templates/base/admin_location.xsl
2011-06-28 11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/property/templates/base/admin_location.xsl
2011-06-28 11:07:59 UTC (rev 7444)
@@ -318,7 +318,7 @@
</xsl:template>
<!-- add / edit -->
- <xsl:template match="edit">
+ <xsl:template match="edit" xmlns:php="http://php.net/xsl";>
<div align="left">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
@@ -393,33 +393,39 @@
<xsl:call-template name="list_info"/>
</td>
</tr>
-
<tr>
- <td
valign="top">
-
<xsl:value-of select="lang_list_address"/>
+ <td
align="left">
+
<xsl:value-of select="php:function('lang', 'list address')" />
</td>
+ <td>
+ <input
type="checkbox" name="values[list_address]" value="1" >
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'list address at this
level')" />
+
</xsl:attribute>
+
<xsl:if test="value_list_address = '1'">
+
<xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+
</xsl:attribute>
+
</xsl:if>
+ </input>
+ </td>
+ </tr>
+ <tr>
<td
align="left">
-
<xsl:choose>
-
<xsl:when test="value_list_address='1'">
-
<input type="checkbox" name="values[list_address]" value="1"
checked="checked" onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="//lang_list_address_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
</input>
-
</xsl:when>
-
<xsl:otherwise>
-
<input type="checkbox" name="values[list_address]" value="1"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="//lang_list_address_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
</input>
-
</xsl:otherwise>
-
</xsl:choose>
+
<xsl:value-of select="php:function('lang', 'list documents')" />
</td>
+ <td>
+ <input
type="checkbox" name="values[list_documents]" value="1" >
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'list documents at level')"
/>
+
</xsl:attribute>
+
<xsl:if test="value_list_documents = '1'">
+
<xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+
</xsl:attribute>
+
</xsl:if>
+ </input>
+ </td>
</tr>
</xsl:when>
</xsl:choose>
Modified: branches/dev-thomasez/property/templates/base/entity.xsl
===================================================================
--- branches/dev-thomasez/property/templates/base/entity.xsl 2011-06-28
11:06:25 UTC (rev 7443)
+++ branches/dev-thomasez/property/templates/base/entity.xsl 2011-06-28
11:07:59 UTC (rev 7444)
@@ -76,7 +76,7 @@
<xsl:when test="mode = 'edit'">
<tr>
<td colspan =
"2" align = "center">
-
<xsl:apply-templates select="table_apply"/>
+
<xsl:call-template name="table_apply"/>
</td>
</tr>
</xsl:when>
@@ -316,7 +316,7 @@
<table cellpadding="2"
cellspacing="2" width="80%" align="center">
<tr height="50">
<td colspan="2"
align = "center">
-
<xsl:apply-templates select="table_apply"/>
+
<xsl:call-template name="table_apply"/>
</td>
</tr>
</table>
@@ -383,30 +383,31 @@
</xsl:template>
- <xsl:template match="table_apply">
+ <xsl:template name="table_apply" xmlns:php="http://php.net/xsl";>
<table>
<tr>
<td valign="bottom">
- <xsl:variable
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
+ <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save')"
/></xsl:variable>
<input type="submit"
name="values[save]" value="{$lang_save}">
<xsl:attribute name="title">
- <xsl:value-of
select="lang_save_statustext"/>
+ <xsl:value-of
select="php:function('lang', 'save values and exit')" />
</xsl:attribute>
</input>
</td>
+
<td valign="bottom">
- <xsl:variable
name="lang_apply"><xsl:value-of select="lang_apply"/></xsl:variable>
+ <xsl:variable
name="lang_apply"><xsl:value-of select="php:function('lang', 'apply')"
/></xsl:variable>
<input type="submit"
name="values[apply]" value="{$lang_apply}">
<xsl:attribute name="title">
- <xsl:value-of
select="lang_apply_statustext"/>
+ <xsl:value-of
select="php:function('lang', 'save and stay in form')" />
</xsl:attribute>
</input>
</td>
<td align="right" valign="bottom">
- <xsl:variable
name="lang_cancel"><xsl:value-of select="lang_cancel"/></xsl:variable>
+ <xsl:variable
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')"
/></xsl:variable>
<input type="submit"
name="values[cancel]" value="{$lang_cancel}">
<xsl:attribute name="title">
- <xsl:value-of
select="lang_cancel_statustext"/>
+ <xsl:value-of
select="php:function('lang', 'Back to the list')" />
</xsl:attribute>
</input>
</td>
Property changes on:
branches/dev-thomasez/rental/inc/model/class.composite.inc.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/rental/inc/model/class.contract_date.inc.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/dev-thomasez/rental/inc/model/class.unit.inc.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/dev-thomasez/sms/bin/default/config_BR
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/dev-thomasez/sms/bin/default/config_BR_log
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/dev-thomasez/sms/bin/default/config_SD
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/dev-thomasez/sms/bin/default/config_SD_log
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/dev-thomasez/sms/bin/default/config_ST
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/dev-thomasez/sms/bin/default/config_STATUS_log
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/dev-thomasez/sms/bin/default/config_ST_log
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/dev-thomasez/sms/bin/default/config_VASK
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/dev-thomasez/sms/bin/default/config_VASK_log
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/dev-thomasez/sms/bin/default/log_firealarm.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/sms/bin/default/receipt_service_agreement.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/dev-thomasez/sms/bin/default/set_workorder_status.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7444] Merge from trunk.,
Thomas Lundquist <=