Fix Date bug and Fix README

This commit is contained in:
Schoumi 2018-11-02 12:50:54 +01:00
parent b8055de857
commit 73a32cf850
2 changed files with 25 additions and 29 deletions

View File

@ -11,7 +11,7 @@ What's Cozy?
What is this konnector about ?
------------------------------
This konnector retrieves your <SOME DATA> and <SOME OTHER DATA> from <SERVICE>
This konnector retrieves your declarationsi from [Net-Entreprises](https://net-entreprises.fr) for Micro/Auto Entrepreneur
<YOUR DESCRIPTION HERE>
### Open a Pull-Request
@ -28,7 +28,11 @@ Create a `konnector-dev-config.json` file at the root with your test credentials
```javascript
{
"COZY_URL": "http://cozy.tools:8080",
"fields": {"login":"zuck.m@rk.fb", "password":"123456"}
"fields": {
"siret":"12345678901234",
"lastname":"LastName",
"firstname":"FirstName",
"password":"1234567890"
}
```
Then :
@ -45,7 +49,7 @@ This connector uses [cozy-konnector-libs](https://github.com/cozy/cozy-konnector
### Maintainer
The lead maintainers for this konnector is <YOUR NAME>
The lead maintainers for this konnector is Schoumi
### Get in touch
@ -62,7 +66,7 @@ You can reach the Cozy Community by:
License
-------
<YOUR KONNECTOR NAME> is developed by <your name> and distributed under the [AGPL v3 license][agpl-3.0].
Net-Entreprises-AE is developed by Schoumi and distributed under the [AGPL v3 license][agpl-3.0].
[cozy]: https://cozy.io "Cozy Cloud"
[agpl-3.0]: https://www.gnu.org/licenses/agpl-3.0.html

View File

@ -163,20 +163,19 @@ async function getAllDeclaration(params, declarationList) {
let accData = this.getAccountData()
let exist = Object.keys(accData).length > 0
let bills = []
let lastPeriod = declarationList.length -1
let lastPeriod = declarationList.length - 1
if (exist) {
let lastSaved = declarationList.indexOf(accData.lastSaved)
if(lastSaved !== -1)
lastPeriod = lastSaved
if (lastSaved !== -1) lastPeriod = lastSaved
}
for (let i = lastPeriod; i >= 0; i--) {
try {
const bill = await getDeclaration(params, declarationList[i])
bills.push(bill)
accData.lastSaved = declarationList[i]
this.saveAccountData(accData,{merge:false})
} catch(error) {
break;
this.saveAccountData(accData, { merge: false })
} catch (error) {
break
}
}
return bills
@ -198,7 +197,7 @@ async function getDeclaration(params, periode) {
let subData = scrape(data('#table-paiements-tldp .cellule_droite_middle'), {
amount: {
sel: 'span#libmtpai',
parse: value => parseInt(value)
parse: value => { value = value.replace(".",""); return parseInt(value) }
}
})
let bill = {}
@ -212,34 +211,27 @@ async function getDeclaration(params, periode) {
},
'.tableau_donnees .cellule_droite_middle'
)
subData = subData[3].date
subData = subData[2].date
.substring(3)
.substring(0, 10)
.trim()
moment.locale('fr')
subData = subData.split('/')
let day = parseInt(subData[0]) + 1
let day = parseInt(subData[0])
day = day < 10 ? '0' + day.toString() : day.toString()
bill.date = moment('' + subData[2] + '-' + subData[1] + '-' + day)
bill.date = moment('' + subData[2] + '-' + subData[1] + '-' + day+'T00:00:00.000Z').add(1,'days')
bill.vendor = 'urssaf'
/**/
let month = periode % 100
if(month % 10 == 0) {
if (month % 10 == 0) {
month = month / 10
}
else
{
let tri = Math.floor(month/10)
} else {
let tri = Math.floor(month / 10)
month = month % 10
month = (tri - 1) * 3 + month
if(month < 10)
month = '0'+month
if (month < 10) month = '0' + month
}
let year = 2000+Math.floor(periode/100)
bill.filename = ''+year+'-'+month+'.pdf'
/**/
let year = 2000 + Math.floor(periode / 100)
bill.filename = '' + year + '-' + month + '.pdf'
bill.date = bill.date.toDate()
bill.filestream = await buildDeclarationPDF(data, periode)
return bill
@ -313,7 +305,7 @@ async function buildDeclarationPDF(data, periode) {
subData.each((i, elem) => {
const savedElem = elem
elem = data(elem).children('td')
let optsRight = { alignment: 'right' }
let optsCenter = { alignment: 'center' }
@ -506,7 +498,7 @@ async function buildDeclarationPDF(data, periode) {
}
delete optsRight.colspan
delete optsLeft.colspan
optsLeft.backgroundColor='#A0A0A0'
optsLeft.backgroundColor = '#A0A0A0'
}
})