commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

gnue/packages/hr package-doc/hr.sgml personnel/...


From: Neil Tiffin
Subject: gnue/packages/hr package-doc/hr.sgml personnel/...
Date: Sat, 08 Dec 2001 17:18:43 -0500

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Neil Tiffin <address@hidden>    01/12/08 17:18:43

Modified files:
        packages/hr/package-doc: hr.sgml 
        packages/hr/personnel/classes: ps.gcd 
        packages/hr/personnel/doc: personnel.sgml 

Log message:
        Update and sync machines.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/packages/hr/package-doc/hr.sgml.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/packages/hr/personnel/classes/ps.gcd.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/packages/hr/personnel/doc/personnel.sgml.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/packages/hr/package-doc/hr.sgml
diff -c gnue/packages/hr/package-doc/hr.sgml:1.1 
gnue/packages/hr/package-doc/hr.sgml:1.2
*** gnue/packages/hr/package-doc/hr.sgml:1.1    Sun Dec  2 10:07:50 2001
--- gnue/packages/hr/package-doc/hr.sgml        Sat Dec  8 17:18:43 2001
***************
*** 12,19 ****
  <!ENTITY chapter.recruit        SYSTEM "../recruit/doc/recruit.sgml">
  <!ENTITY chapter.train          SYSTEM "../train/doc/train.sgml">
  
  <!--
- <!ENTITY customercode           SYSTEM "../customer/classes/customer.gcd">
  <!ENTITY salesordercode         SYSTEM 
"../sales-order/classes/sales-order.gcd">
  
  <!ENTITY linetypedata                 SYSTEM 
"../sales-order/defaults/insert-en-line-type.geas">
--- 12,19 ----
  <!ENTITY chapter.recruit        SYSTEM "../recruit/doc/recruit.sgml">
  <!ENTITY chapter.train          SYSTEM "../train/doc/train.sgml">
  
+ <!ENTITY pscode                 SYSTEM "../personnel/classes/ps.gcd">
  <!--
  <!ENTITY salesordercode         SYSTEM 
"../sales-order/classes/sales-order.gcd">
  
  <!ENTITY linetypedata                 SYSTEM 
"../sales-order/defaults/insert-en-line-type.geas">
***************
*** 23,29 ****
  <!ENTITY % global.shared   SYSTEM "shared/shared.ent">
  
  <!-- Build Date -->
! <!ENTITY gnue.build-date "$Id: hr.sgml,v 1.1 2001/12/02 15:07:50 ntiffin Exp 
$">
  
  <!-- %global.chapters; -->
  %global.shared;
--- 23,29 ----
  <!ENTITY % global.shared   SYSTEM "shared/shared.ent">
  
  <!-- Build Date -->
! <!ENTITY gnue.build-date "$Id: hr.sgml,v 1.2 2001/12/08 22:18:43 ntiffin Exp 
$">
  
  <!-- %global.chapters; -->
  %global.shared;
Index: gnue/packages/hr/personnel/classes/ps.gcd
diff -c gnue/packages/hr/personnel/classes/ps.gcd:1.1 
gnue/packages/hr/personnel/classes/ps.gcd:1.2
*** gnue/packages/hr/personnel/classes/ps.gcd:1.1       Sat Dec  8 08:58:41 2001
--- gnue/packages/hr/personnel/classes/ps.gcd   Sat Dec  8 17:18:43 2001
***************
*** 22,28 ****
  #
  # This file originally written by Neil Tiffin (address@hidden).
  #
! # $Revision: 1.1 $ $Date: 2001/12/08 13:58:41 $ $Author: ntiffin $
  #
  
  include "../../../base/currency/classes/currency.gcd"
--- 22,28 ----
  #
  # This file originally written by Neil Tiffin (address@hidden).
  #
! # $Revision: 1.2 $ $Date: 2001/12/08 22:18:43 $ $Author: ntiffin $
  #
  
  include "../../../base/currency/classes/currency.gcd"
***************
*** 31,53 ****
  module ps
  {
  
!   extend person:employee
    {
!     ps::hire  *hire;          # add reference to hr data in base
    };
  
! 
    #---------------------------------------------------
    # employee - personal details relating to employment
    #---------------------------------------------------
    class hire
    {
!       # using reference because this data will
!       # need to have different security than base
!       # employee data, which will be public
!       
      person::employee *base;   # ref to base data
    
      date    date_of_birth;
      char    sex_code<8>;
      char    former_name<25>;
--- 31,62 ----
  module ps
  {
  
!   extend person::employee
    {
!     ps::hire  *hire;    # add reference to hr data in base
    };
  
!   #--------------------------------------------
!   # status of employee
!   #--------------------------------------------
!   class status
!   {
!     char   desc<25>; # temporary, permanent, retired
!   };
!   
    #---------------------------------------------------
    # employee - personal details relating to employment
    #---------------------------------------------------
    class hire
    {
!     # using reference because this data will
!     # need to have different security than base
!     # employee data, which will be public
!     
      person::employee *base;   # ref to base data
    
+     ps::status       *status;
+     
      date    date_of_birth;
      char    sex_code<8>;
      char    former_name<25>;
***************
*** 71,77 ****
                 # Each country will have its own validation rules
      char    national_id<12>;
      
!     ps::contract [] contracts; # link to contracts
    };
    
    #--------------------------------------------
--- 80,88 ----
                 # Each country will have its own validation rules
      char    national_id<12>;
      
!     ps::contract   [] contracts; # link to contracts
!     ps::nok        [] nok;       # link to next of kin
!     ps::former_emp [] former_emplyer;
    };
    
    #--------------------------------------------
***************
*** 88,98 ****
      date    expected_end_date;
      date    actual_end_date;
      char    reason_ended_code;
-     char    status_code<8>;  #perm, temp, etc.
      int     hours_per_week;
      
      currency::money   annual_salary;
      currency::money   hourly_rate;
  
    };
  };
--- 99,142 ----
      date    expected_end_date;
      date    actual_end_date;
      char    reason_ended_code;
      int     hours_per_week;
      
      currency::money   annual_salary;
      currency::money   hourly_rate;
  
    };
+   
+   #--------------------------------------------
+   # relationship definitions
+   #--------------------------------------------
+   class relationship
+   {
+     char  desc<25>; # son, father, wife etc.
+   };
+   
+   #--------------------------------------------
+   # next of kin - nok details
+   #--------------------------------------------
+   class nok
+   {
+     person::person   person;
+ 
+     ps::hire         *hire;
+     ps::relationship *relationship;
+   };
+   
+   #--------------------------------------------
+   # former employer - details
+   #--------------------------------------------
+   class former_emp
+   {
+     ps::hire   *hire;
+     
+     char    name<25>;
+     char    job_title<25>;
+     date    started;
+     date    left;
+   };
+ 
+   
  };
Index: gnue/packages/hr/personnel/doc/personnel.sgml
diff -c gnue/packages/hr/personnel/doc/personnel.sgml:1.2 
gnue/packages/hr/personnel/doc/personnel.sgml:1.3
*** gnue/packages/hr/personnel/doc/personnel.sgml:1.2   Sat Dec  8 08:58:41 2001
--- gnue/packages/hr/personnel/doc/personnel.sgml       Sat Dec  8 17:18:43 2001
***************
*** 3,9 ****
        <sect1>
                <title>Requirements</title> 
                <para>
!                       This chapter is $Revision: 1.2 $ $Date: 2001/12/08 
13:58:41 $. 
                </para>
                <sect2>
                        <title>Business Requirements</title> 
--- 3,9 ----
        <sect1>
                <title>Requirements</title> 
                <para>
!                       This chapter is $Revision: 1.3 $ $Date: 2001/12/08 
22:18:43 $. 
                </para>
                <sect2>
                        <title>Business Requirements</title> 
***************
*** 155,188 ****
                        <itemizedlist mark=bullet>
                                <listitem>
                                        <para>
!                                               TODO 
                                        </para>
                                </listitem>
-                               <listitem>
-                                       <para>
- TODO
-                                       </para>
-                               </listitem>
-                               <listitem>
-                                       <para>
- TODO
-                                       </para>
-                               </listitem>
                        </itemizedlist>
                </sect2>
                <sect2>
                        <title>Business Object Definition</title> 
                        <para>
-                               <programlisting>
-                                       &salesordercode; 
-                               </programlisting>
-                       </para>
-               </sect2>
-               <sect2>
-                       <title>Business Object Definition</title> 
-                       <para>
                                <programlisting>
!                                       &linetypedata; 
                                </programlisting>
                        </para>
                </sect2>
--- 155,170 ----
                        <itemizedlist mark=bullet>
                                <listitem>
                                        <para>
!                                               None 
                                        </para>
                                </listitem>
                        </itemizedlist>
                </sect2>
                <sect2>
                        <title>Business Object Definition</title> 
                        <para>
                                <programlisting>
!                                       &pscode; 
                                </programlisting>
                        </para>
                </sect2>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]