diff --git a/package-lock.json b/package-lock.json index f5471af9..46e93bd4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ngx-openmrs-formentry", - "version": "2.12.17", + "version": "2.12.23", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index fe0bde1b..80c9b4ba 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@ampath-kenya/ngx-openmrs-formentry", "main": "ngx-openmrs-formentry/dist/ngx-formentry", - "version": "2.12.17", + "version": "2.12.23", "scripts": { "ng": "ng", "start": "ng serve", diff --git a/projects/ngx-formentry/src/components/ngx-date-time-picker/ngx-date-time-picker.component.html b/projects/ngx-formentry/src/components/ngx-date-time-picker/ngx-date-time-picker.component.html index 98811325..df958134 100644 --- a/projects/ngx-formentry/src/components/ngx-date-time-picker/ngx-date-time-picker.component.html +++ b/projects/ngx-formentry/src/components/ngx-date-time-picker/ngx-date-time-picker.component.html @@ -22,13 +22,13 @@
- {{ count }} Weeks + {{ count }} Days
diff --git a/projects/ngx-formentry/src/components/ngx-date-time-picker/ngx-date-time-picker.component.ts b/projects/ngx-formentry/src/components/ngx-date-time-picker/ngx-date-time-picker.component.ts index 54e37693..5f62f320 100644 --- a/projects/ngx-formentry/src/components/ngx-date-time-picker/ngx-date-time-picker.component.ts +++ b/projects/ngx-formentry/src/components/ngx-date-time-picker/ngx-date-time-picker.component.ts @@ -99,7 +99,7 @@ export class NgxDateTimePickerComponent public weekSelect($event) { const dateToUse = moment().format(); - const nextWeekDate = moment(dateToUse).add($event.value, 'weeks'); + const nextWeekDate = moment(dateToUse).add($event.value, 'days'); const nextWeekTime = dateToUse; this.setDateTime(nextWeekDate, nextWeekTime); } diff --git a/scripts/build.sh b/scripts/build.sh index b64affd9..a2dee9e2 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1 +1,2 @@ -ng build --prod ngx-formentry \ No newline at end of file +ng build --prod ngx-formentry +sed -i -e 's/ngx-openmrs-formentry/ngx-openmrs-formentry\/dist\/ngx-formentry/g' ./dist/ngx-formentry/ngx-openmrs-formentry.metadata.json diff --git a/target/npmlist.json b/target/npmlist.json new file mode 100644 index 00000000..6f81a1e3 --- /dev/null +++ b/target/npmlist.json @@ -0,0 +1 @@ +{"version":"2.12.9","name":"ngx-openmrs-formentry","dependencies":{"@angular/animations":{"version":"6.1.10"},"@angular/cdk":{"version":"6.4.7"},"@angular/common":{"version":"6.1.10"},"@angular/compiler":{"version":"6.1.10"},"@angular/core":{"version":"6.1.10"},"@angular/forms":{"version":"6.1.10"},"@angular/http":{"version":"6.1.10"},"@angular/material-moment-adapter":{"version":"6.4.7"},"@angular/material":{"version":"6.4.7"},"@angular/platform-browser-dynamic":{"version":"6.1.10"},"@angular/platform-browser":{"version":"6.1.10"},"@angular/router":{"version":"6.1.10"},"bootstrap":{"version":"3.4.1"},"core-js":{"version":"2.6.12"},"font-awesome":{"version":"4.7.0"},"hammerjs":{"version":"2.0.8"},"jquery":{"version":"3.6.1"},"jspdf":{"version":"1.5.3"},"lodash":{"version":"4.17.21"},"moment":{"version":"2.29.4"},"ngx-bootstrap":{"version":"4.3.0"},"ngx-cookie":{"version":"4.1.2"},"ngx-file-uploader":{"version":"0.0.18"},"ngx-webcam":{"version":"0.2.6"},"pdfmake":{"version":"0.1.40"},"reflect-metadata":{"version":"0.1.13"},"rxjs-compat":{"version":"6.6.7"},"rxjs":{"version":"6.3.3"},"shelljs":{"version":"0.7.8"},"slick-carousel":{"version":"1.8.1"},"time-ago-pipe":{"version":"1.3.2"},"tree-model":{"version":"1.0.7"},"zone.js":{"version":"0.8.29"}}} \ No newline at end of file