Merge branch 'test' of https://github.com/icefoganalytics/sfa-client …

…into test
ytgov · Sep 16, 2023 · 1dd0bcf · 1dd0bcf
2 parents f95660e + 4451f65
commit 1dd0bcf
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/api/routes/admin/csl-msfaa-send-router.ts b/src/api/routes/admin/csl-msfaa-send-router.ts
@@ -23,7 +23,7 @@ cslMsfaaSendRouter.get("/:EXPORT_DATE/:SEQ_NUM/:FLAG",
             let v_mailing;
             let v_out_record;
             let v_count = 0;
-            let v_total_sin = '';
+            let v_total_sin = 0;
             let v_mailing_address1;
             let v_mailing_address2;
             let v_mailing_city;
@@ -49,7 +49,7 @@ cslMsfaaSendRouter.get("/:EXPORT_DATE/:SEQ_NUM/:FLAG",
 
 			v_filename = 'PPYT.EDU.MSFA.SENT.' + v_send_date + nextVal[0].nextVal;
 
-            v_out_record = '100' + 'YT  ' + 'MSFAA SENT'.padEnd(40, ' ') + v_send_date + v_send_time +  nextVal[0].nextVal.padStart(6, '0') + ' '.padEnd(535, ' ');
+            v_out_record = '100' + 'YT  ' + 'MSFAA SENT'.padEnd(40, ' ') + v_send_date + v_send_time +  nextVal[0].nextVal.padStart(6, '0') + ' ' + '\n';
 
             if(FLAG === '0') {			
                 msfaa_view_select = await db("sfa.vw_msfaa_send")
@@ -131,10 +131,10 @@ cslMsfaaSendRouter.get("/:EXPORT_DATE/:SEQ_NUM/:FLAG",
                         (col.home_country ? col.home_country : ' ').substring(0, 20).padEnd(20, ' ') +
                         (v_home_phone ? v_home_phone : ' ').padStart(20, '0') +
                         (col.part_full_time ? col.part_full_time :  'FT').padEnd(2, ' ') +
-                        ' '.padEnd(110, ' ');
+                        ' ' + '\n';
 
                         v_count = v_count + 1;
-                        v_total_sin = v_total_sin + (col.sin ? col.sin : '');
+                        v_total_sin = v_total_sin + Number((col.sin ? col.sin : 0));
 
                         let sp_msfaa_send = await db.raw(`EXEC sfa.sp_update_msfa_send ${nextVal[0].nextVal}, ${col.agreement_number ? col.agreement_number : -1};`);  						             
                     }								
@@ -217,10 +217,10 @@ cslMsfaaSendRouter.get("/:EXPORT_DATE/:SEQ_NUM/:FLAG",
 					(col.home_country ? col.home_country : ' ').substring(0, 20).padEnd(20, ' ') +
 					(v_home_phone ? v_home_phone : ' ').padStart(20, '0') +
 					(col.part_full_time ? col.part_full_time : 'FT').padEnd(2, ' ') +
-					' '.padEnd(112, ' ');
+					' ' + '\n';
 
 					v_count = v_count + 1;
-					v_total_sin = v_total_sin + (col.sin ? col.sin : 0);
+					v_total_sin = v_total_sin + Number((col.sin ? col.sin : 0));
 
 					let sp_msfaa_send = await db.raw(`EXEC sfa.sp_update_date_msfa_send ${nextVal[0].nextVal}, '${moment(v_send_date, 'YYYYMMDD').format('YYYY-MM-DD')}', ${col.agreement_number ? col.agreement_number : -1};`);  
 				}