Skip to content

Poc 246 #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
</div>
<div [class]="getWeekPickerCssClass()" *ngIf="showWeeks">
<mat-select
placeholder="Select Weeks"
placeholder="Select Days"
class="form-control"
name="weeks"
(selectionChange)="weekSelect($event)"
>
<mat-option *ngFor="let count of weeks" [value]="count">
{{ count }} Weeks
{{ count }} Days
</mat-option>
</mat-select>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
3 changes: 2 additions & 1 deletion scripts/build.sh
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
ng build --prod ngx-formentry
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
1 change: 1 addition & 0 deletions target/npmlist.json
Original file line number Diff line number Diff line change
@@ -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"}}}