removed graduation year field

valentin-stamate · Dec 7, 2021 · fd7412b · fd7412b
1 parent 42f6d4a
commit fd7412b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/src/app/graphql/queries/queries.gql b/src/app/graphql/queries/queries.gql
@@ -1,4 +1,4 @@
 type Query {
     hello: String
-    getStudentsData(user: String!, password: String!): String
+    getStudentsData(user: String!, password: String!): [String]
 }
diff --git a/src/app/graphql/queries/types.gql b/src/app/graphql/queries/types.gql
@@ -8,7 +8,6 @@ input StudentForm {
     marriageName: String
     thesis: String
     coordinator: String
-    graduationYear: String
     scholarShip: String
     completionDate: String
     cnatdcuRank: String

diff --git a/src/app/graphql/resolvers/mutations.ts b/src/app/graphql/resolvers/mutations.ts
@@ -8,8 +8,6 @@ export const mutations = {
     sendForm: async ({form}: any) => {
         const studentId = form.studentId;
 
-        console.log(form)
-
         const idRegex = new RegExp('([0-9]+[A-Z]+[0-9]+)');
 
         if (!idRegex.test(studentId) && studentId.length < 10) {

diff --git a/src/app/graphql/resolvers/queries.ts b/src/app/graphql/resolvers/queries.ts
@@ -15,7 +15,7 @@ export const queries = {
     getStudentsData: async ({user, password}: any) => {
 
         if (user === 'adriana.bejinariu' && password === 'u^*&9jy8da-02eic-lwvun4') {
-            return `http://localhost:8080/${cons.downloadKey}`;
+            return [`http://localhost:8080/${cons.downloadKey}`];
         }
 
         throw new Error("Invalid credentials");

diff --git a/src/app/script/util/students_file.ts b/src/app/script/util/students_file.ts
@@ -7,7 +7,6 @@ export const columnOrderWithName = [
     ['marriageName', 'Nume de Casatorie'],
     ['thesis', 'Teza de Doctorat'],
     ['coordinator', 'Coordonator'],
-    ['graduationYear', 'Anul Absolvirii'],
     ['scholarShip', 'Bursa'],
     ['completionDate', 'Data Completarii'],
     ['cnatdcuRank', 'Rank CNATDCU'],
@@ -85,3 +84,22 @@ export const columnOrderMap = new Map();
 for (let i in columnOrderWithName) {
     columnOrderMap.set(columnOrderWithName[i][0], i);
 }
+
+// TODO Second type of student document
+
+// export const columnOrderWithNameSecond = [
+//     ['studentId', 'Numar Matricol'],
+//     ['doctoralThesisType', 'Tip Formular'],
+//     ['name', 'Nume'],
+//
+// ];
+//
+// export const columnOrderSecond: string[] = [];
+// for (const column of columnOrderWithNameSecond) {
+//     columnOrderSecond.push(column[0]);
+// }
+//
+// export const columnOrderMapSecond = new Map();
+// for (let i in columnOrderWithNameSecond) {
+//     columnOrderMapSecond.set(columnOrderWithNameSecond[i][0], i);
+// }