lms-sync 1.0.7 → 1.0.9

package/apiConnections/apiConnects.js

@@ -2,7 +2,7 @@ const axios = require('axios')
 const axiosRetry = require('axios-retry')
 const fs = require('fs')
 const path = require('path')
-
+const { Picked } = require('./semesterPick')
 
 const Apis = {
     async ApiConnections() {
@@ -138,13 +138,21 @@ const Apis = {
             const { login, apis } = await this.Login();
 
             //get the current date
-            let defaultDate = new Date()
+            // let defaultDate = new Date()
+
+            // //get the current year
+            // let currentYear = defaultDate.getFullYear()
+
+            // //get the current year and minus it to 1 for the previous year
+            // let previousYear = currentYear - 1
+
+            // let fromPrompts = await semesterPick.Picked()
 
-            //get the current year
-            let currentYear = defaultDate.getFullYear()
+            let fromPrompts = await Picked()
 
-            //get the current year and minus it to 1 for the previous year
-            let previousYear = currentYear - 1
+            let semester = fromPrompts.semester
+            let currentYear = fromPrompts.yearTo
+            let previousYear = fromPrompts.yearFrom
 
             //join the previous year and the current year
             let currentSchoolYear = previousYear + '-' + currentYear
@@ -158,7 +166,8 @@ const Apis = {
             // console.log('acadYearResult.data :>> ', acadYearResult.data);
             return {
                 acadYearResult:acadYearResult.data,
-                currentSchoolYear: currentSchoolYear
+                currentSchoolYear: currentSchoolYear,
+                semester
             }
         } catch (error) {
             console.error('Academic Year Api Error:', error)
@@ -205,13 +214,12 @@ const Apis = {
     async Student(){
         try {
             const { login, apis } = await this.Login();
-            const {currentSchoolYear} = await this.AcademicYear()
-            // console.log('currentSchoolYear :>> ', currentSchoolYear);
+            const {currentSchoolYear, semester} = await this.AcademicYear()
             const student = await apis.instance.post('/students/enrolled',
                 {
                     "school_year": `${currentSchoolYear}`,
-                    "school_term": "2nd Semester",
-                    "limit": 999999,
+                    "school_term": `${semester}`,
+                    "limit": 999999999,
                 },
                 {
                 headers:{
@@ -230,12 +238,12 @@ const Apis = {
     async Section(){
         try {
             const { login, apis } = await this.Login();
-            const {currentSchoolYear} = await this.AcademicYear()
+            const {currentSchoolYear, semester} = await this.AcademicYear()
             const sectionResult = await apis.instance.post('/sections',
                 {
                     "school_year": `${currentSchoolYear}`,
-                    "school_term": "2nd Semester",
-                    "limit": 999999,
+                    "school_term": `${semester}`,
+                    "limit": 999999999,
                 },
                 {
                 headers:{

package/apiConnections/semesterPick.js

@@ -0,0 +1,57 @@
+const prompts = require('prompts')
+
+let picker = null; 
+
+async function promptYearSem(){
+    const response = await prompts([
+        {
+            type: 'text',
+            name: 'Academic Year From',
+            message: 'Please insert the Academic Year From:'
+        },
+        {
+            type: 'text',
+            name: 'Academic Year To',
+            message: 'Please insert the Academic Year To:'
+        },
+        {
+            type: 'select',
+            name: 'Semester',
+            message: 'Please pick Semester:',
+            choices:[
+                { title: '1st Semester', value: '1st Semester' },
+                { title: '2nd Semester', value: '2nd Semester' },
+                { title: 'School Year', value: 'School Year' },
+            ]
+        }
+    ])
+
+    picker = {
+        semester: response.Semester,
+        yearFrom: response['Academic Year From'],
+        yearTo: response['Academic Year To']
+    }
+}
+ 
+async function Picked(){
+    try {
+
+        if (!picker) {
+            await promptYearSem()  
+        }       
+
+        let pickYearSem = picker
+
+        return pickYearSem
+        
+    } catch (error) {
+        console.error(error);
+        return
+    }
+    
+}
+
+module.exports = {
+    // YearSec: promptYearSem
+    Picked
+}

package/app.js

@@ -17,11 +17,10 @@ async function start(){
         if (startSequel) {
             console.log('Connected to Sequelize.');
             console.log(`Sequelize host:`, startSequel.config.host);
-        } 
+        }
         if(apis && startSequel){
             console.log('Both connections successful. Starting migrations...');
-            // await mappings.Server()
-            await mappings.Enrolled()
+            await mappings.Server()
         }
         else {
             console.error('Failed to establish database and api connections. Migrations not started.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lms-sync",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Migration App for MSC LMS",
   "main": "index.js",
   "scripts": {