Please take our Survey
logo       
<prev   next>

Choosing A Webhost:
A web hosting service is a type of Internet hosting service that allows individuals and organizations to provide their own website accessible via the World Wide Web. Web hosts are companies that provide space on a server they own for use by their clients as well as providing Internet connectivity, typically in a data center. Web hosts can also provide data center space and connectivity to the Internet for servers they do not own to be located in their data center, called colocation. more...

CVS: property list_workorder.php,1.8,1.9 add_equipment.php,1.3,1.4 edit_equ: msg#00650

web.phpgroupware.cvs

Subject: CVS: property list_workorder.php,1.8,1.9 add_equipment.php,1.3,1.4 edit_equipment.php,1.3,1.4 list_equipment.php,1.3,1.4 list_vendors_activities.php,1.2,1.3 event_apartment.php,1.1.1.1,1.2

Update of /cvsroot/phpgroupware/property
In directory subversions:/tmp/cvs-serv10469

Modified Files:
list_workorder.php add_equipment.php edit_equipment.php
list_equipment.php list_vendors_activities.php
event_apartment.php
Log Message:
no message

Index: list_workorder.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_workorder.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** list_workorder.php 24 Sep 2002 15:44:47 -0000 1.8
--- list_workorder.php 28 Sep 2002 22:07:12 -0000 1.9
***************
*** 41,44 ****
--- 41,45 ----


$t->set_var('coordinator_list',select_coordinator_list(account_id,$coordinator_id,workorder));
+ $t->set_var('lang_coordinator',lang('Coordinator'));
$t->set_var('lang_all',lang('All'));
$t->set_var('lang_none',lang('None'));
***************
*** 69,73 ****
else { $limit = 15; }

- $t->set_var('lang_coordinator',lang('Coordinator'));

if (!$status)
--- 70,73 ----

Index: add_equipment.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/add_equipment.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** add_equipment.php 3 Sep 2002 22:15:38 -0000 1.3
--- add_equipment.php 28 Sep 2002 22:07:12 -0000 1.4
***************
*** 78,82 ****
}
if ($errorcount) {
$t->set_var('message',$GLOBALS['phpgw']->common->error_list($error)); }
! if (($submit) && (! $error) && (! $errorcount)) {
$t->set_var('message',lang('Equipment x has been added !',$num)); }
if ((! $submit) && (! $error) && (! $errorcount)) {
$t->set_var('message',''); }

--- 78,82 ----
}
if ($errorcount) {
$t->set_var('message',$GLOBALS['phpgw']->common->error_list($error)); }
! if (($submit) && (! $error) && (! $errorcount)) {
$t->set_var('message',lang('Equipment x has been added !',$equipment_id)); }
if ((! $submit) && (! $error) && (! $errorcount)) {
$t->set_var('message',''); }

***************
*** 125,128 ****
--- 125,129 ----
$t->set_var('lang_choose',lang('Generate Equipment ID ?'));
$t->set_var('choose','<input type="checkbox" name="choose"
value="True">');
+ $t->set_var('equipment_id','<input type="text"
name="equipment_id" value="'.$equipment_id.'">');
}
else
***************
*** 130,133 ****
--- 131,135 ----
$t->set_var('lang_choose','');
$t->set_var('choose','');
+ $t->set_var('equipment_id',$equipment_id);
}


Index: edit_equipment.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/edit_equipment.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** edit_equipment.php 3 Sep 2002 22:15:38 -0000 1.3
--- edit_equipment.php 28 Sep 2002 22:07:12 -0000 1.4
***************
*** 21,25 ****
. '<input type="hidden" name="sub" value="' . $sub . '">' . "\n"
. '<input type="hidden" name="start" value="' . $start . '">' .
"\n"
! . '<input type="hidden" name="filter" value="' . $filter . '">'
. "\n";
//. '<input type="hidden" name="abid" value="' . $abid . '">' .
"\n";

--- 21,26 ----
. '<input type="hidden" name="sub" value="' . $sub . '">' . "\n"
. '<input type="hidden" name="start" value="' . $start . '">' .
"\n"
! . '<input type="hidden" name="filter" value="' . $filter . '">'
. "\n"
! . '<input type="hidden" name="equipment_id" value="' .
$equipment_id . '">' . "\n";
//. '<input type="hidden" name="abid" value="' . $abid . '">' .
"\n";

***************
*** 182,189 ****
$t->set_var('lang_action',lang('Edit Equipment'));

$t->set_var('addressbook_link',$GLOBALS['phpgw']->link('/property/addressbook.php','query='));
!
$t->set_var('property_link',$GLOBALS['phpgw']->link('/property/property.php','query='));
!
$t->set_var('building_link',$GLOBALS['phpgw']->link('/property/building.php','query='));
!
$t->set_var('entrance_link',$GLOBALS['phpgw']->link('/property/entrance.php','query='));
!
$t->set_var('apartment_link',$GLOBALS['phpgw']->link('/property/apartment.php','query='));

// --------------- end lokalisering-------------------
--- 183,190 ----
$t->set_var('lang_action',lang('Edit Equipment'));

$t->set_var('addressbook_link',$GLOBALS['phpgw']->link('/property/addressbook.php','query='));
!
$t->set_var('property_link',$GLOBALS['phpgw']->link('/property/search_property.php','query='));
!
$t->set_var('building_link',$GLOBALS['phpgw']->link('/property/search_building.php','query='));
!
$t->set_var('entrance_link',$GLOBALS['phpgw']->link('/property/search_entrance.php','query='));
!
$t->set_var('apartment_link',$GLOBALS['phpgw']->link('/property/search_apartment.php','query='));

// --------------- end lokalisering-------------------

Index: list_equipment.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_equipment.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** list_equipment.php 3 Sep 2002 22:15:38 -0000 1.3
--- list_equipment.php 28 Sep 2002 22:07:12 -0000 1.4
***************
*** 170,173 ****
--- 170,174 ----

$t->set_var('edit',$GLOBALS['phpgw']->link('/property/edit_equipment.php','equipment_id='
. $GLOBALS['phpgw']->db->f('equipment_id') . "&equipment_type_edit=" .
$equipment_type_edit .
"&sort=$sort&order=$order&query=$query&start=$start&filter=$filter"));

$t->set_var('attribute',$GLOBALS['phpgw']->link('/property/add_equipment_attribute.php','equipment_type_id='
. $GLOBALS['phpgw']->db->f('equipment_type_id') . "&equipment_id=" .
$equipment_id .
"&sort=$sort&order=$order&query=$query&start=$start&filter=$filter"));
+
$t->set_var('link_event',$GLOBALS['phpgw']->link('/property/list_event.php','&equipment_id='
. $equipment_id .
"&coordinator_id=all&order=$order&query=$query&start=$start&filter=$filter"));

$t->set_var('delete',$GLOBALS['phpgw']->link('/property/delete_equipment.php','equipment_id='
. $GLOBALS['phpgw']->db->f('equipment_id') .
"&sort=$sort&order=$order&query=$query&start=$start&filter=$filter"));


Index: list_vendors_activities.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_vendors_activities.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** list_vendors_activities.php 1 Sep 2002 19:43:49 -0000 1.2
--- list_vendors_activities.php 28 Sep 2002 22:07:12 -0000 1.3
***************
*** 65,69 ****
//----------

! while($entry=each($select))
{

--- 65,71 ----
//----------

! if ($select)
! {
! while($entry=each($select))
{

***************
*** 105,108 ****
--- 107,111 ----
. " values ('$activity_id_h[$n]',
'$vendor_id_h[$n]','$next_index_count', '$new_index', '$new_m_cost',
'$new_w_cost', '$new_total_cost' , '$new_date', '1')");
}
+ }
}

***************
*** 237,255 ****
$t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
$t->set_var('currency',$currency);
- $t->set_var('lang_edit',lang('Edit'));
$t->set_var('lang_index_count',lang('Index Count'));
$t->set_var('sort_num',lang('Activity Num'));
- $t->set_var('lang_delete',lang('Delete'));
$t->set_var('lang_branch',lang('Branch'));
$t->set_var('lang_vendor',lang('Vendor'));
- $t->set_var('lang_new_index',lang('New Index'));
$t->set_var('lang_select',lang('Select'));
! $t->set_var('lang_cost',lang('Cost'));
$t->set_var('lang_prizing',lang('Prizing'));
$t->set_var('lang_last_index',lang('Last index'));
! $t->set_var('lang_descr',lang('descr'));
$t->set_var('lang_m_cost',lang('Material cost'));
$t->set_var('lang_w_cost',lang('Labour cost'));
$t->set_var('lang_unit',lang('Unit'));
// ---------------------------- end header declaration
-------------------------------------

--- 240,271 ----
$t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
$t->set_var('currency',$currency);
$t->set_var('lang_index_count',lang('Index Count'));
$t->set_var('sort_num',lang('Activity Num'));
$t->set_var('lang_branch',lang('Branch'));
$t->set_var('lang_vendor',lang('Vendor'));
$t->set_var('lang_select',lang('Select'));
! $t->set_var('lang_cost',lang('Total Cost'));
$t->set_var('lang_prizing',lang('Prizing'));
$t->set_var('lang_last_index',lang('Last index'));
! $t->set_var('lang_descr',lang('Description'));
$t->set_var('lang_m_cost',lang('Material cost'));
$t->set_var('lang_w_cost',lang('Labour cost'));
$t->set_var('lang_unit',lang('Unit'));
+
+ if ($admin_activity)
+ {
+ $t->set_var('lang_prizing',lang('Prizing'));
+ $t->set_var('lang_edit',lang('Edit'));
+ $t->set_var('lang_delete',lang('Delete'));
+ $t->set_var('lang_new_index',lang('New Index'));
+ }
+ else
+ {
+ $t->set_var('lang_prizing','');
+ $t->set_var('lang_edit','');
+ $t->set_var('lang_delete','');
+ $t->set_var('lang_new_index','');
+ }
+
// ---------------------------- end header declaration
-------------------------------------

***************
*** 266,270 ****


! $select = '<input type="checkbox" name="select[' . $j . ']"
value="'. $j . '">';

$activity_id =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('activity_id'));
--- 282,293 ----


! if ($admin_activity)
! {
! $select = '<input type="checkbox" name="select[' . $j .
']" value="'. $j . '">';
! }
! else
! {
! $select = '';
! }

$activity_id =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('activity_id'));
***************
*** 296,301 ****

$vendor_id =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('vendor_id'));
-
$t->set_var('prizing',$GLOBALS['phpgw']->link('/property/activity_vendor_prizing.php','id='
. $activity_id . '&vendor_id=' . $vendor_id
."&order=$order&query=$query&start=$start&filter=$filter"));

$t->set_var(array('select' => $select,
'descr' => $descr,
--- 319,327 ----

$vendor_id =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('vendor_id'));

+ if ($admin_activity)
+ {
+
$t->set_var('prizing',$GLOBALS['phpgw']->link('/property/activity_vendor_prizing.php','id='
. $activity_id . '&vendor_id=' . $vendor_id
."&order=$order&query=$query&start=$start&filter=$filter"));
+ }
$t->set_var(array('select' => $select,
'descr' => $descr,
***************
*** 324,334 ****
// ------------------------------- end record declaration
--------------------------------
}
! $new_index = '<input type="text" name="new_index" size="5" >';
! $t->set_var('new_index',$new_index);
! $t->set_var('lang_new_date',lang('Date:'));
! $dateout =
$GLOBALS['phpgw']->common->show_date(mktime(),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
! $new_date= '<input type="text" name="new_date" value="' . $dateout . '"
size="12" readonly >';
! $t->set_var('new_date',$new_date);
! $t->set_var('lang_popup_calendar',lang('Popup Calendar'));

// ------------------------- template declaration for Add Form
---------------------------
--- 350,374 ----
// ------------------------------- end record declaration
--------------------------------
}
!
! if ($admin_activity)
! {
! $new_index = '<input type="text" name="new_index" size="5" >';
! $t->set_var('new_index',$new_index);
! $t->set_var('lang_new_date',lang('Date:'));
! $dateout =
$GLOBALS['phpgw']->common->show_date(mktime(),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
! $new_date= '<input type="text" name="new_date" value="' .
$dateout . '" size="12" readonly >';
! $t->set_var('new_date',$new_date);
! $t->set_var('lang_popup_calendar',lang('Popup Calendar'));
! $t->set_var('submit','<input type="submit"name="submit"
value="'.lang('Add').'">');
! }
! else
! {
! $t->set_var('new_index','');
! $t->set_var('lang_new_date','');
! $t->set_var('new_date','');
! $t->set_var('lang_popup_calendar','');
! $t->set_var('submit','');
! }
!

// ------------------------- template declaration for Add Form
---------------------------

Index: event_apartment.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/event_apartment.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** event_apartment.php 28 Aug 2002 16:43:09 -0000 1.1.1.1
--- event_apartment.php 28 Sep 2002 22:07:12 -0000 1.2
***************
*** 55,68 ****
$t->set_var('font',$GLOBALS['phpgw_info']['theme']['font']);
$t->set_var('lang_search',lang('Search'));
!
$t->set_var('search_action',$GLOBALS['phpgw']->link('/property/event_search_apartment.php'));
$t->set_var('lang_category',lang('Category'));
$t->set_var('lang_all',lang('All'));


!
$t->set_var('actionurl',$GLOBALS['phpgw']->link('/property/add_search_apartment.php'));
!
$t->set_var('apartmenturl',$GLOBALS['phpgw']->link('/property/event_search_apartment.php'));
$t->set_var('hidden_vars',$hidden_vars);
$t->set_var('lang_search',lang('Search'));
!
$t->set_var('searchurl',$GLOBALS['phpgw']->link('/property/event_search_apartment.php'));

if (! $start)
--- 55,68 ----
$t->set_var('font',$GLOBALS['phpgw_info']['theme']['font']);
$t->set_var('lang_search',lang('Search'));
!
$t->set_var('search_action',$GLOBALS['phpgw']->link('/property/event_apartment.php'));
$t->set_var('lang_category',lang('Category'));
$t->set_var('lang_all',lang('All'));


!
$t->set_var('actionurl',$GLOBALS['phpgw']->link('/property/add_apartment.php'));
!
$t->set_var('apartmenturl',$GLOBALS['phpgw']->link('/property/event_apartment.php'));
$t->set_var('hidden_vars',$hidden_vars);
$t->set_var('lang_search',lang('Search'));
!
$t->set_var('searchurl',$GLOBALS['phpgw']->link('/property/event_apartment.php'));

if (! $start)
***************
*** 161,166 ****

// ---------------- nextmatch variable template-declarations
------------------------------
! $left =
$GLOBALS['phpgw']->nextmatchs->left('/property/event_search_apartment.php',$start,$total_records,"&cat_id=$cat_id&location_code=$location_code");
! $right =
$GLOBALS['phpgw']->nextmatchs->right('/property/event_search_apartment.php',$start,$total_records,"&cat_id=$cat_id&location_code=$location_code");
$t->set_var('left',$left);
$t->set_var('right',$right);
--- 161,166 ----

// ---------------- nextmatch variable template-declarations
------------------------------
! $left =
$GLOBALS['phpgw']->nextmatchs->left('/property/event_apartment.php',$start,$total_records,"&cat_id=$cat_id&location_code=$location_code");
! $right =
$GLOBALS['phpgw']->nextmatchs->right('/property/event_apartment.php',$start,$total_records,"&cat_id=$cat_id&location_code=$location_code");
$t->set_var('left',$left);
$t->set_var('right',$right);
***************
*** 171,183 ****

$t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
!
$t->set_var('sort_property',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'objekt_id',$order,'/property/event_search_apartment.php',lang('Property')));
!
$t->set_var('sort_building',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'bygg_id',$order,'/property/event_search_apartment.php',lang('Building')));
!
$t->set_var('sort_entrance',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'seksjons_id',$order,'/property/event_search_apartment.php',lang('Entrance')));
!
$t->set_var('sort_apartment',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'leie_id',$order,'/property/event_search_apartment.php',lang('Apartment')));
!
$t->set_var('sort_street',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'gatenavn',$order,'/property/event_search_apartment.php',lang('Street')));
!
$t->set_var('sort_floor',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'etasje',$order,'/property/event_search_apartment.php',lang('Floor')));
$t->set_var('lang_street_number',lang('Street number'));
$t->set_var('lang_select',lang('Select'));
!
$t->set_var('cats_action',$GLOBALS['phpgw']->link('/property/event_search_apartment.php',"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id&objekt_id=$objekt_id&bygg_id=$bygg_id"));

$t->set_var('cats_list',$c->formated_list('select','all',$cat_id,'True'));
$t->set_var('lang_attribute',lang('Attribute'));
--- 171,183 ----

$t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
!
$t->set_var('sort_property',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'objekt_id',$order,'/property/event_apartment.php',lang('Property')));
!
$t->set_var('sort_building',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'bygg_id',$order,'/property/event_apartment.php',lang('Building')));
!
$t->set_var('sort_entrance',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'seksjons_id',$order,'/property/event_apartment.php',lang('Entrance')));
!
$t->set_var('sort_apartment',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'leie_id',$order,'/property/event_apartment.php',lang('Apartment')));
!
$t->set_var('sort_street',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'gatenavn',$order,'/property/event_apartment.php',lang('Street')));
!
$t->set_var('sort_floor',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'etasje',$order,'/property/event_apartment.php',lang('Floor')));
$t->set_var('lang_street_number',lang('Street number'));
$t->set_var('lang_select',lang('Select'));
!
$t->set_var('cats_action',$GLOBALS['phpgw']->link('/property/event_apartment.php',"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id&objekt_id=$objekt_id&bygg_id=$bygg_id"));

$t->set_var('cats_list',$c->formated_list('select','all',$cat_id,'True'));
$t->set_var('lang_attribute',lang('Attribute'));
<Prev in Thread] Current Thread [Next in Thread>
Previous by Date:  CVS: property/templates/default header.tpl,1.8,1.9 formequipment.tpl,1.2,1.3 list_equipment.tpl,1.1.1.1,1.2 list_vendors_activities.tpl,1.1.1.1,1.2, Sigurd Nes <sigurdne@xxxxxxxxx>
Next by Date:  CVS: phpgwapi/templates/default cat_filter.xsl,1.2,1.3 cat_select.xsl,1.5,1.6, Bettina Gille <ceb@xxxxxxxxxxxxxxxx>
Previous by Thread:  CVS: property/templates/default header.tpl,1.8,1.9 formequipment.tpl,1.2,1.3 list_equipment.tpl,1.1.1.1,1.2 list_vendors_activities.tpl,1.1.1.1,1.2, Sigurd Nes <sigurdne@xxxxxxxxx>
Next by Thread:  CVS: phpgwapi/templates/default cat_filter.xsl,1.2,1.3 cat_select.xsl,1.5,1.6, Bettina Gille <ceb@xxxxxxxxxxxxxxxx>
Indexes:  [Date] [Thread] [Top] [All Lists]

Google Custom Search
Recently Viewed:
qnx.openqnx.dev...    gcc.libstdc++.c...    solaris.opensol...    information-ret...    misc.misterhous...    web.catalyst.ge...    apache.webservi...    redhat.release....    hardware.lirc/2...    kernel.autofs/2...    technology.sust...    linux.vdr/2003-...    editors.lyx.gen...    org.user-groups...    netbsd.devel.pk...    xdg.devel/2004-...    version-control...    jakarta.slide.d...    debian.packages...    creativecommons...    ports.ppc.embed...    bug-tracking.bu...   
Home | blog view | USPTO Patent Archive | advertise | OSDir is an inevitable website. super tiny logo

Free Magazines

Cisco News
Receive a free quarterly e-newsletter with exclusive articles on how Cisco IT uses its own products and solutions to enable the business.
subscribe

Systems Management News, the newspaper for IT systems administration and data center managers! Each issue of Systems Management News is chock-full of news and analysis to help you understand what's happening in your field.
subscribe

The Enterprise Newsweekly eWeek is the essential technology information source for builders of e-business.
subscribe

Oracle Magazine Oracle Magazine contains technology strategy articles, sample code, tips, Oracle and partner news, how to articles for developers and DBAs, and more. Oracle (NASDAQ: ORCL) is the world's largest enterprise software company.
subscribe

Total Telecom Total Telecom is "The Economist of the communications industry".
subscribe