kuali_toolbox 0.41 → 0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff0fe7e4b41d157f2dbe3bcbd892eb81328b050e
-  data.tar.gz: 70060a8d700825d2dc643359a8526f52e0fc0407
+  metadata.gz: 4247d6c4bb00a266d556c58051c2d0ee70a24322
+  data.tar.gz: 649bddc5ccb7ffd32fda70571c8ae511fa3cd51e
 SHA512:
-  metadata.gz: 6dc410080bf76e551112d3d628e881ba40ce4ae00194bccdc7a4757829411279b9d88bd7c9c426765d8c667a1afd9348c2193a50b4bf6e666abd499a0a94cf8d
-  data.tar.gz: ed51b281d44b15579f43fc485d142401bad7a50067dfb6433786d0e2c988b2955e62f2434a9b9f945d4f5cce08c42fb3df576d4891f479192daa40604905b84e
+  metadata.gz: 0c0bb722051db60343b7cd4f42b18512d1a362bbd974bd5a904eb7a056f08154fd70e66619300ae842b1e3f5473955e01dc2497a28ff269362fe113bbef925f0
+  data.tar.gz: 223df77e098c555ca51d5180d0a4ebfb377ab572356864a877074a19c22dc78482e30e7f58de8ef6f5fbbdf09213b270795d79fcc6379615d42813aafe5c75d7

data/bin/transform_CSV_to_HR_XML

@@ -189,7 +189,7 @@ def buildAffiliations(row)
 
   if (!emp.empty?)
     emp[:primaryEmployment] = true
-    aff[:employment] = []
+    aff[:employment] = [];
     aff[:employment].push(emp);
   end
   if (!aff.empty?)
@@ -295,6 +295,20 @@ def addToListIfNotIncluded(item, list)
   end
 end
 
+def mergeEmployment(record, newAffiliation)
+  if (!newAffiliation[:employment].nil?)
+    newAffiliation[:employment].each do |employmentInfo|
+      if (record[:employment].nil?)
+        record[:employment] = []
+      end
+      if (!record[:employment].find{ |x| x[:primaryEmployment] }.nil?)
+        employmentInfo[:primaryEmployment] = false
+      end
+      record[:employment].push(employmentInfo)
+    end
+  end
+end
+
 opt = parse_command_line_options (File.basename $0), ARGF.argv
 
 text_parse_errors = []
@@ -315,8 +329,23 @@ CSV.open(opt[:csv_filename], opt[:csv_options]) do |csv|
       if (!newAffiliation.nil? && record[:affiliations].nil?)
         record[:affiliations] = []
       end
-      if (!record[:affiliations].include? newAffiliation)
+      duplicateAffil = record[:affiliations].find{ |affil| affil[:affiliationType] == newAffiliation[:affiliationType] && affil[:campus] == newAffiliation[:campus]};
+      if (duplicateAffil.nil?)
+        if (newAffiliation[:default] && !record[:affiliations].find{ |x| x[:default] }.nil?)
+          newAffiliation[:default] = false
+        end
+        mergeEmployment(record, newAffiliation)
         record[:affiliations].push(newAffiliation)
+      else
+        duplicateAffil[:employment].each do |employmentInfo|
+          newAffiliation[:employment].each do |newEmployment|
+            if (employmentInfo.select{ |key, value| key != :primaryEmployment} != newEmployment.select{ |key, value| key != :primaryEmployment})
+              e = Struct.new(:message).new("WARNING:Duplicate employment info for single affiliation. Skipping extra employment info on #{$.}");
+              puts e.message;
+              text_parse_errors.push e;
+            end
+          end
+        end
       end
 
       record[:names] = addToListIfNotIncluded(buildName(row), record[:names])

data/lib/kuali_toolbox/version.rb

@@ -16,5 +16,5 @@
 
 module KualiCo
   # The gem version number.
-  VERSION = "0.41"
+  VERSION = "0.42"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuali_toolbox
 version: !ruby/object:Gem::Version
-  version: '0.41'
+  version: '0.42'
 platform: ruby
 authors:
 - KualiCo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder