phpgroupware-cvs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: timetrack/setup/sql common_default_records.inc.p

From: Bob Schader <address@hidden>
Subject: [Phpgroupware-cvs] CVS: timetrack/setup/sql common_default_records.inc.php,1.1,1.1.2.1 mysql_dropnewtables.inc.php,1.1,1.1.2.1 mysql_newtables.inc.php,1.5,1.5.2.1 mysql_upgradetables.inc.php,1.1,1.1.2.1 setup_users.inc.php,1.1,1.1.2.1
Date: Thu, 14 Mar 2002 14:22:17 -0500 
Update of /cvsroot/phpgroupware/timetrack/setup/sql
In directory subversions:/tmp/cvs-serv30258

Modified Files:
      Tag: Version-0_9_14-branch
        common_default_records.inc.php mysql_dropnewtables.inc.php 
        mysql_newtables.inc.php mysql_upgradetables.inc.php 
        setup_users.inc.php 
Log Message:
fixes for 0.9.14rc2

Index: common_default_records.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/timetrack/setup/sql/common_default_records.inc.php,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** common_default_records.inc.php      8 May 2001 16:00:22 -0000       1.1
--- common_default_records.inc.php      14 Mar 2002 19:22:12 -0000      1.1.2.1
***************
*** 38,68 ****
  
      echo 'Loading default Work catagory records...<br>';
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_work_catagories 
(work_catagory_id, catagory_desc) "
        . "VALUES (1,'3D Modeling')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_work_catagories 
(work_catagory_id, catagory_desc) "
        . "VALUES (2,'2D Detailing')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_work_catagories 
(work_catagory_id, catagory_desc) "
        . "VALUES (3,'Project Management')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_work_catagories 
(work_catagory_id, catagory_desc) "
        . "VALUES (4,'Data Management')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_work_catagories 
(work_catagory_id, catagory_desc) "
        . "VALUES (5,'External System Management')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_work_catagories 
(work_catagory_id, catagory_desc) "
        . "VALUES (6,'CAD Manufacturing')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_work_catagories 
(work_catagory_id, catagory_desc) "
        . "VALUES (7,'Checking')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_work_catagories 
(work_catagory_id, catagory_desc) "
        . "VALUES (8,'Engineering Analysis')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_work_catagories 
(work_catagory_id, catagory_desc) "
        . "VALUES (9,'Consulting')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_work_catagories 
(work_catagory_id, catagory_desc) "
        . "VALUES (10,'Misc. Internal Work')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_work_catagories 
(work_catagory_id, catagory_desc) "
        . "VALUES (11,'Internal Development')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_work_catagories 
(work_catagory_id, catagory_desc) "
        . "VALUES (12,'Internal Systems Management')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_work_catagories 
(work_catagory_id, catagory_desc) "
        . "VALUES (13,'Vacation')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_work_catagories 
(work_catagory_id, catagory_desc) "
        . "VALUES (14,'Sick Leave')");
  
--- 38,68 ----
  
      echo 'Loading default Work catagory records...<br>';
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_wk_cat (work_catagory_id, 
catagory_desc) "
        . "VALUES (1,'3D Modeling')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_wk_cat (work_catagory_id, 
catagory_desc) "
        . "VALUES (2,'2D Detailing')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_wk_cat (work_catagory_id, 
catagory_desc) "
        . "VALUES (3,'Project Management')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_wk_cat (work_catagory_id, 
catagory_desc) "
        . "VALUES (4,'Data Management')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_wk_cat (work_catagory_id, 
catagory_desc) "
        . "VALUES (5,'External System Management')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_wk_cat (work_catagory_id, 
catagory_desc) "
        . "VALUES (6,'CAD Manufacturing')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_wk_cat (work_catagory_id, 
catagory_desc) "
        . "VALUES (7,'Checking')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_wk_cat (work_catagory_id, 
catagory_desc) "
        . "VALUES (8,'Engineering Analysis')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_wk_cat (work_catagory_id, 
catagory_desc) "
        . "VALUES (9,'Consulting')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_wk_cat (work_catagory_id, 
catagory_desc) "
        . "VALUES (10,'Misc. Internal Work')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_wk_cat (work_catagory_id, 
catagory_desc) "
        . "VALUES (11,'Internal Development')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_wk_cat (work_catagory_id, 
catagory_desc) "
        . "VALUES (12,'Internal Systems Management')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_wk_cat (work_catagory_id, 
catagory_desc) "
        . "VALUES (13,'Vacation')");
!     $phpgw->db->query("INSERT INTO phpgw_ttrack_wk_cat (work_catagory_id, 
catagory_desc) "
        . "VALUES (14,'Sick Leave')");
  

Index: mysql_dropnewtables.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/timetrack/setup/sql/mysql_dropnewtables.inc.php,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** mysql_dropnewtables.inc.php 8 May 2001 16:00:22 -0000       1.1
--- mysql_dropnewtables.inc.php 14 Mar 2002 19:22:12 -0000      1.1.2.1
***************
*** 14,18 ****
    $phpgw->db->query("DROP TABLE IF EXISTS phpgw_ttrack_customers");
    echo 'Dropping Employee Profiles table...<br>';
!   $phpgw->db->query("DROP TABLE IF EXISTS phpgw_ttrack_employee_profiles");
    echo 'Dropping Jobs table...<br>';
    $phpgw->db->query("DROP TABLE IF EXISTS phpgw_ttrack_jobs");
--- 14,18 ----
    $phpgw->db->query("DROP TABLE IF EXISTS phpgw_ttrack_customers");
    echo 'Dropping Employee Profiles table...<br>';
!   $phpgw->db->query("DROP TABLE IF EXISTS phpgw_ttrack_emplyprof");
    echo 'Dropping Jobs table...<br>';
    $phpgw->db->query("DROP TABLE IF EXISTS phpgw_ttrack_jobs");
***************
*** 24,28 ****
    $phpgw->db->query("DROP TABLE IF EXISTS phpgw_ttrack_locations");
    echo 'Dropping Work Catagories table...<br>';
!   $phpgw->db->query("DROP TABLE IF EXISTS phpgw_ttrack_work_catagories");
  
    // Additional code to remove TTrack_Managers group, assoc acls,
--- 24,28 ----
    $phpgw->db->query("DROP TABLE IF EXISTS phpgw_ttrack_locations");
    echo 'Dropping Work Catagories table...<br>';
!   $phpgw->db->query("DROP TABLE IF EXISTS phpgw_ttrack_wk_cat");
  
    // Additional code to remove TTrack_Managers group, assoc acls,

Index: mysql_newtables.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/timetrack/setup/sql/mysql_newtables.inc.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** mysql_newtables.inc.php     16 Jul 2001 13:23:26 -0000      1.5
--- mysql_newtables.inc.php     14 Mar 2002 19:22:12 -0000      1.5.2.1
***************
*** 33,37 ****
    // id was con, this field needs to be the same as the id field in 
phpgw_accounts
    echo 'Creating Employee Profiles table...<br>';
!   $sql = "CREATE TABLE phpgw_ttrack_employee_profiles (
      id int(11) DEFAULT '0' NOT NULL,
      lid varchar(20),
--- 33,37 ----
    // id was con, this field needs to be the same as the id field in 
phpgw_accounts
    echo 'Creating Employee Profiles table...<br>';
!   $sql = "CREATE TABLE phpgw_ttrack_emplyprof (
      id int(11) DEFAULT '0' NOT NULL,
      lid varchar(20),
***************
*** 112,116 ****
  
    echo 'Creating Work Catagories table...<br>';
!   $sql = "CREATE TABLE phpgw_ttrack_work_catagories (
      work_catagory_id int(10) unsigned NOT NULL auto_increment,
      catagory_desc varchar(50),
--- 112,116 ----
  
    echo 'Creating Work Catagories table...<br>';
!   $sql = "CREATE TABLE phpgw_ttrack_wk_cat (
      work_catagory_id int(10) unsigned NOT NULL auto_increment,
      catagory_desc varchar(50),
***************
*** 128,132 ****
     app_name, app_title, app_enabled, app_order, app_tables, app_version) 
     VALUES ('timetrack','Time Tracking',1,12,
!    
'phpgw_ttrack_customers,phpgw_ttrack_employee_profiles,phpgw_ttrack_job_details,phpgw_ttrack_job_status,phpgw_ttrack_jobs,phpgw_ttrack_locations,phpgw_ttrack_work_catagories',
     '0.9.10')");
   } else {
--- 128,132 ----
     app_name, app_title, app_enabled, app_order, app_tables, app_version) 
     VALUES ('timetrack','Time Tracking',1,12,
!    
'phpgw_ttrack_customers,phpgw_ttrack_emplyprof,phpgw_ttrack_job_details,phpgw_ttrack_job_status,phpgw_ttrack_jobs,phpgw_ttrack_locations,phpgw_ttrack_wk_cat',
     '0.9.10')");
   } else {

Index: mysql_upgradetables.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/timetrack/setup/sql/mysql_upgradetables.inc.php,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** mysql_upgradetables.inc.php 8 May 2001 16:00:22 -0000       1.1
--- mysql_upgradetables.inc.php 14 Mar 2002 19:22:12 -0000      1.1.2.1
***************
*** 35,38 ****
--- 35,39 ----
    echo"Renaming employee_profiles to 'phpgw_ttrack_employee_profiles'...<br>";
    $phpgw->db->query("ALTER TABLE employee_profiles rename AS 
phpgw_ttrack_employee_profiles");
+   $phpgw->db->query("ALTER TABLE phpgw_ttrack_employee_profiles rename AS 
phpgw_ttrack_emplyprof");
    echo "Renaming job_details to 'phpgw_ttrack_job_details'...<br>";
    $phpgw->db->query("ALTER TABLE job_details rename as 
phpgw_ttrack_job_details");
***************
*** 52,55 ****
--- 53,57 ----
    echo "Renaming work_catagories to 'phpgw_ttrack_work_catagories'...<br>";
    $phpgw->db->query("alter table work_catagories rename as 
phpgw_ttrack_work_catagories");
+   $phpgw->db->query("alter table phpgw_ttrack_work_catagories rename as 
phpgw_ttrack_wk_cat");
  // Note: We also have to do the following yet:
  // Create the new TTrack_Managers and TTrack_payroll groups.

Index: setup_users.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/timetrack/setup/sql/setup_users.inc.php,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** setup_users.inc.php 8 May 2001 16:00:22 -0000       1.1
--- setup_users.inc.php 14 Mar 2002 19:22:12 -0000      1.1.2.1
***************
*** 37,41 ****
            // I suppose eventually this code should be put in class functions.
            // set default location_id to #1 for all profiles
!           $sql = "INSERT into phpgw_ttrack_employee_profiles " 
             . "(id, lid, location_id) VALUES ($id, '$lid', 1)";
            echo "Employee Profile added.<br>";
--- 37,41 ----
            // I suppose eventually this code should be put in class functions.
            // set default location_id to #1 for all profiles
!           $sql = "INSERT into phpgw_ttrack_emplyprof " 
             . "(id, lid, location_id) VALUES ($id, '$lid', 1)";
            echo "Employee Profile added.<br>";
reply via email to
[Prev in Thread] Current Thread [Next in Thread]