Merge pull request #35 from IBM/feature/new_dept_employee

Create employee from department screen
IBM · Jan 23, 2024 · eaee792 · eaee792
2 parents e4bc22a + 08f739f
commit eaee792
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/qddssrc/depts.dspf b/qddssrc/depts.dspf
@@ -32,5 +32,5 @@
      A                                  2 35'Departments'
      A                                      DSPATR(UL)
      A                                      COLOR(WHT)
-     A                                  4  6'5=View'
+     A                                  4  6'5=View 8=New Employee'
      A                                      COLOR(BLU)
diff --git a/qddssrc/nemp.dspf b/qddssrc/nemp.dspf
@@ -24,7 +24,7 @@
      A                                 10  2'Department'
      A                                      DSPATR(UL)
      A                                      COLOR(WHT)
-     A            XDEPT          3A  B 10 14
+     A            XDEPT          3A  O 10 14
 
      A                                 11  9'Job'
      A                                      DSPATR(UL)
@@ -36,7 +36,7 @@
      A                                      COLOR(WHT)
      A            XSAL          10A  B 12 14
 
-     A                                 13  8'Phone'
+     A                                 13  7'Phone'
      A                                      DSPATR(UL)
      A                                      COLOR(WHT)
      A            XTEL           4A  B 13 14

diff --git a/qrpglesrc/depts.pgm.sqlrpgle b/qrpglesrc/depts.pgm.sqlrpgle
@@ -5,6 +5,10 @@
           DepartmentNumber Char(3);
         End-Pr;
 
+        Dcl-Pr NewEmp ExtPgm;
+          DepartmentNumber Char(3);
+        End-Pr;
+
       //---------------------------------------------------------------*
 
       /include 'qrpgleref/constants.rpgleinc'
@@ -143,6 +147,7 @@
                   Employees(XID);
                 When (SelVal = '8');
                   // Insert new employee screen
+                  NewEmp(XID);
               Endsl;
 
               If (XSEL <> *Blank);

diff --git a/qrpglesrc/newemp.pgm.sqlrpgle b/qrpglesrc/newemp.pgm.sqlrpgle
@@ -4,6 +4,10 @@ ctl-opt dftactgrp(*no);
 
 // TODO: need a way to let the parent program pass in a department id
 
+dcl-pi NEWEMP;
+  currentDepartment Char(3);
+end-pi;
+
 // ---------------------------------------------------------------*
 
 /INCLUDE 'qrpgleref/constants.rpgleinc'
@@ -46,6 +50,8 @@ else;
   XID = autoEmpId;
 Endif;
 
+XDEPT = currentDepartment;
+
 Dow (NOT Exit);
 
   Write HEADER_FMT;
@@ -82,7 +88,7 @@ Dcl-Proc HandleInsert;
   newEmp.FIRSTNME = XFIRST;
   newEmp.MIDINIT = XINIT;
   newEmp.LASTNAME = XLAST;
-  newEmp.WORKDEPT = XDEPT;
+  newEmp.WORKDEPT = currentDepartment;
   newEmp.JOB = XJOB;
   newEmp.HIREDATE = %Date;
   newEmp.PHONENO = XTEL;
@@ -122,6 +128,8 @@ Dcl-Proc GetError;
     return 'Last name cannot be blank';
   endif;
 
+  // We have left this in so the user
+  // cannot continue if no dept is passed in.
   if (XDEPT = '');
     return 'Department cannot be blank';
   endif;