Skip to content

Commit

Permalink
Merge pull request #7 from feugy/2017-fixes
Browse files Browse the repository at this point in the history
Fix printing early closure
  • Loading branch information
feugy authored Sep 15, 2017
2 parents 561effe + 3737f4a commit 73ad606
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 6 deletions.
14 changes: 13 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@

DanceRM is a specialized Customer Relationship software built for Dance schools.

## Crafting new release

DanceRM is now using [electron-builder][builder] to publish new release.
To publish a new one:

1. change version in `package.json`
2. push to github all changes, using PRs
3. Create a github release, tag must be `package.json` version prefixed with `v`. Set title and description, then publish it.
4. set GH_TOKEN has environment variable
4. run `npm run release`

## Bugs

Expand Down Expand Up @@ -31,4 +41,6 @@ DanceRM is a specialized Customer Relationship software built for Dance schools.
[ci-badge]: https://travis-ci.org/feugy/dancerm.svg?branch=master
[ci-link]: https://travis-ci.org/feugy/dancerm
[coverage-badge]: https://coveralls.io/repos/github/feugy/dancerm/badge.svg?branch=master
[coverage-link]: https://coveralls.io/github/feugy/dancerm?branch=master
[coverage-link]: https://coveralls.io/github/feugy/dancerm?branch=master
[builder]: https://github.com/electron-userland/electron-builder
[github-releases]: https://help.github.com/articles/creating-releases/
4 changes: 3 additions & 1 deletion app/src/controller/invoice.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,9 @@ class InvoiceController
_.defer ->
remote.getCurrentWindow().show()
window.print()
_.defer -> remote.getCurrentWindow().close()
_.delay ->
remote.getCurrentWindow().close()
, 100
return

# redirect to invoice list if needded
Expand Down
4 changes: 3 additions & 1 deletion app/src/print/addresses.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,6 @@ window.customClass = class Print
# remove configuration and unselected stamps
angular.element(document).find('body').addClass 'printing'
window.print()
_.defer -> remote.getCurrentWindow().close()
_.delay ->
remote.getCurrentWindow().close()
, 100
4 changes: 3 additions & 1 deletion app/src/print/call_list.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ window.customClass = class CallListPrint
_.defer ->
remote.getCurrentWindow().show()
window.print()
_.defer -> remote.getCurrentWindow().close()
_.delay ->
remote.getCurrentWindow().close()
, 100

# Display dance class title
#
Expand Down
4 changes: 3 additions & 1 deletion app/src/print/settlement.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ window.customClass = class Print

remote.getCurrentWindow().show()
window.print()
_.defer -> remote.getCurrentWindow().close()
_.delay ->
remote.getCurrentWindow().close()
, 100

# Retrieve dance classes of a given dancer
#
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dancerm",
"version": "4.1.0",
"version": "4.3.0",
"author": "Feugy <[email protected]>",
"description": "DanceRM is a very simple Customer Relationship software specialized for dance schools",
"repository": {
Expand Down Expand Up @@ -98,6 +98,7 @@
"!dancerm*.json",
"!usefull.md",
"!log.txt",
"!**/coverage/*",
"!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme,test,__tests__,tests,powered-test,example,examples,*.d.ts}",
"!**/node_modules/.bin",
"!**/*.{o,hprof,orig,pyc,pyo,rbc}",
Expand Down

0 comments on commit 73ad606

Please sign in to comment.