@vixoniccom/aniversarios 0.0.1-beta.3 → 1.0.1-beta.0

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.0.1-beta.0](https://bitbucket.org/rexmas_cl/aniversarios/compare/v1.0.0...v1.0.1-beta.0) (2023-02-28)
+
+## [1.0.0](https://gitlab.com/mandomedio/vixonic/aniversarios/compare/v0.0.2...v1.0.0) (2022-08-01)
+
+### [0.0.2](https://gitlab.com/mandomedio/vixonic/aniversarios/compare/v0.0.1...v0.0.2) (2022-08-01)
+
+### [0.0.1](https://gitlab.com/mandomedio/vixonic/aniversarios/compare/v0.0.1-beta.3...v0.0.1) (2022-08-01)
+
 ### [0.0.1-beta.3](https://gitlab.com/mandomedio/vixonic/aniversarios/compare/v0.0.1-beta.2...v0.0.1-beta.3) (2022-06-08)
 
 ### [0.0.1-beta.2](https://gitlab.com/mandomedio/vixonic/aniversarios/compare/v0.0.1-beta.1...v0.0.1-beta.2) (2022-06-06)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixoniccom/aniversarios",
   "alias": "Aniversarios",
-  "version": "0.0.1-beta.3",
+  "version": "1.0.1-beta.0",
   "description": "Muestra el día que el trabajador está de aniversario en la empresa.",
   "main": "main.js",
   "author": "",

package/src/App.tsx

@@ -6,6 +6,7 @@ import { FormattedText } from "./components/FormattedText";
 import { getEmployees, getEmployeesYearly } from "./helpers/getEmployees";
 import { filterEmployees } from "./helpers/filterEmployees";
 import moment from "moment";
+import { getMonth } from "./helpers/utils";
 
 type Props = {
   data: VixonicData;
@@ -50,10 +51,20 @@ export const App = ({ data, start }: Props) => {
     try {
       if (apiDomain !== undefined && apiDomain.includes(urlValid)) {
         let month = Number(moment().format("M")) - 1;
+        let nextMonth = (month === 11) ?  0 : (month + 1); 
+        console.log("🚀 ~ file: App.tsx:55 ~ getData ~ nextMonth", nextMonth)
+        let monthTab = getMonth(month);
+        let nextMonthTab = getMonth(nextMonth);
         if (dataMode !== 'yearly') {
-          contractEmployees = await getEmployees(apiDomain, dataMode);
+          contractEmployees = await getEmployees(apiDomain, dataMode, monthTab);
           const { values } = contractEmployees.data
-          employee = filterEmployees(values, dataMode, excludePast, month)
+          console.log("🚀 ~ file: App.tsx:61 ~ getData ~ values", values)
+          employee.push(...filterEmployees(values, dataMode, excludePast, month))
+          if( dataMode === 'weekly') {
+            contractEmployees = await getEmployees(apiDomain, dataMode, nextMonthTab);
+            const { values: valuesnextMonth } = contractEmployees.data
+            employee.push(...filterEmployees(valuesnextMonth, dataMode, excludePast, nextMonth))
+          }
         }
 
         if (dataMode === 'yearly') {

package/src/components/anniversary-item/shared/AnniversaryImage.tsx

@@ -25,7 +25,6 @@ export const AnniversaryImage = ({ url, size, borderStyle, orientation }: Props)
 
   const imageExist = (url: any) => {
     const isValidImage = url.substr(-3).toLowerCase() === 'png' || url.substr(-3).toLowerCase() === 'jpg' || url.substr(-4).toLowerCase() === 'jpeg'
-    console.log(isValidImage)
     return isValidImage ? url : defaultImg
   }
 

package/src/components/items-container/ItemsContainer.tsx

@@ -57,11 +57,6 @@ export const ItemsContainer = ({ animation, items, animate }: Props) => {
     if (animate && stage === stages.idle) createItems(lastIndex, items)
   }
 
-  console.log(columns)
-  console.log(columnsGap)
-  console.log(rows)
-  console.log(rowsGap)
-
   useEffect(() => {
     configure()
   }, [animation])

package/src/contex/configureContext/configureReducer.ts

@@ -55,7 +55,7 @@ export const anniversaryReducer = (state: VixonicData, action: ConfigureAction)
                     dateMargin: parameters.dateMargin,
                     separator: parameters.separator,
                     nameMaxChar: parameters.nameMaxChar,
-                    descriptionMaxChar: parameters.descriptionMaxChar
+                    descriptionMaxChar: parameters.descriptionMaxChar    
                 }
             }
         default:

package/src/helpers/filterEmployees.ts

@@ -1,10 +1,9 @@
 import moment from "moment";
-import { getNumberWeek } from "./utils";
 
 export const filterEmployees = (values: any, dataMode: string = 'month', excludePast: boolean = false, month: number) => {
-
+    console.log("🚀 ~ file: filterEmployees.ts:5 ~ filterEmployees ~ values", values)
+    let today = moment()
     const day = moment().format("D");
-    const numWeek = getNumberWeek(day);
     const numberMonth = Number(moment().format("M"))-1
  
     let employee = values
@@ -26,7 +25,10 @@ export const filterEmployees = (values: any, dataMode: string = 'month', exclude
         employee = employee.filter((contract: any) => contract.day == day);
     if (dataMode == "weekly")
         employee = employee.filter(
-            (contract: any) => getNumberWeek(contract.day) == numWeek
+            (contract: any) => {
+                let bdayDate = moment([today.year(), contract.month, contract.day])
+                return bdayDate.isoWeek() === today.isoWeek()
+            }
         );
 
     employee.sort((a: any, b: any) => {

package/src/helpers/getEmployees.ts

@@ -1,17 +1,12 @@
 import axios from "axios";
 const API_KEY = 'AIzaSyDQcTlxfd5IyjbeSJooRtNt6OF04DLykqc'
 import { getMonth } from "./utils";
-import moment from 'moment';
 
-export const getEmployees = (apiDomain: string, _dataMode: string = 'month') => {
-  const date = moment()
-  let numberMonth: number = Number(date.format('M'))-1
-  let monthTab = getMonth(numberMonth)
+export const getEmployees = async(apiDomain: string, _dataMode: string = 'month', monthTab: string) => {
   let idGoogle = apiDomain.split("/")[5]
   let URL = `https://sheets.googleapis.com/v4/spreadsheets/${idGoogle}/values`
-
   try {
-    const response = axios({
+    const response = await axios({
       url: `${URL}/${monthTab}?key=${API_KEY}`
     });
     return response;
@@ -25,8 +20,6 @@ export const getEmployeesYearly = (apiDomain: string, numberMonth: number) => {
   let monthTab = getMonth(numberMonth)
   let idGoogle = apiDomain.split("/")[5]
   let URL = `https://sheets.googleapis.com/v4/spreadsheets/${idGoogle}/values`
-
-
   try {
     const response = axios({
       url: `${URL}/${monthTab}?key=${API_KEY}`

package/src/helpers/setToken.ts

@@ -22,8 +22,6 @@ function getToken(apiDomain: any) {
                 orgDomain: apiDomain // This is the body part
             }
         })
-
-        console.log(response)
         return response
     } catch (error) {
         console.error(error);

package/src/test/parameters.json

@@ -1,9 +1,9 @@
 {
     "parameters": {
-      "urlBaseApi": "mandomedio",
-      "msj0": "  ",
+      "apiDomain": "https://docs.google.com/spreadsheets/d/1g-tvPAIk7tCXgn6DuwHp3zC8Gmx55C3wyxZkfSK4VcE/edit?usp=sharing",
+      "msj0": " No ingresos ",
       "padding": "365px 25px 80px 40px",
-      "dataMode": "monthly",
+      "dataMode": "weekly",
       "template": "standard",
       "dateStyle": "circle",
       "photosZip": {