Skip to content

Commit

Permalink
Merge pull request #213 from lomamech/formTurnOff
Browse files Browse the repository at this point in the history
Make form input element turn Off
  • Loading branch information
jniles committed Jan 30, 2017
2 parents 3e4055a + 56f6bb7 commit c271664
Show file tree
Hide file tree
Showing 32 changed files with 107 additions and 95 deletions.
1 change: 1 addition & 0 deletions client/src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"TITLE_ACCOUNT" : "Title Account",
"SET_ROOT" : "Set as root account",
"ROOT_PARENT" : "This account is set as a child of the root account. This means it will be at the highest level in the chart of accounts.",
"RECORDING" : "Create",
"RECORD_SAME" : "No changes have been made to the form. Update the account details and then press submit.",
"SELECT_PARENT" : "Select parent account...",
"SUBMIT_CREATE" : "Create Account",
Expand Down
5 changes: 3 additions & 2 deletions client/src/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"NOT_POSITIVE" : "Contiens des valeurs non positives",
"NUMBER" : "Numéro de compte",
"PROFIT_CENTER" : "Centre des profits",
"RECORDING" : "Enregistrement",
"RECORD_SAME" : "Aucun changement n'a été apporté au formulaire. Mettez à jour les informations du compte, puis appuyez sur Envoyer.",
"ROOT_PARENT" : "Ce compte est défini comme un enfant du compte root. Cela signifie qu'il sera au plus haut niveau dans la hiérarchie des comptes.",
"SELECT_PARENT" : "Choisir le compte parent..",
Expand Down Expand Up @@ -712,7 +713,7 @@
"UPDATE_GROUP_DEBTOR" : "Mettre à jour le Groupe débiteur",
"UPDATE_PATIENT_GROUP" : "Mettre à jour les groupes de patients",
"USE" : "Utilisation",
"USERNAME" : "Nom Utilisateur",
"USERNAME" : "Nom de l'utilisateur",
"USE_POS_RECEIPT" : "Impression POS",
"USE_SIMPLIFIED_CARD" : "Utiliser une identité de patient simple",
"USER" : "Utilisateur",
Expand Down Expand Up @@ -763,7 +764,7 @@
"TYPE" : "Entrer le type",
"UNIT_WEIGHT" : "Entrer le poids",
"UNIT_VOLUME" : "Entrer le volume",
"USERNAME" : "Entrer le nom utilisateur",
"USERNAME" : "Entrer le nom de l'utilisateur",
"VILLAGE" : "Entrer village/Commune",
"FILTER_NAME" : "Filtrer par Nom...",
"FILTER_BY" : "Filtrer par",
Expand Down
2 changes: 1 addition & 1 deletion client/src/partials/accounts/accounts.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<a class="btn btn-default" data-method="create" ui-sref="accounts.create">
<i class="fa fa-plus-square"></i>
{{ "ACCOUNT.CREATE" | translate }}
{{ "ACCOUNT.ADD" | translate }}
</a>
<bh-pdf-print
pdf-url="/reports/finance/accounts/chart"
Expand Down
4 changes: 2 additions & 2 deletions client/src/partials/accounts/edit/accounts.edit.modal.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
<div ng-if="AccountEditCtrl.isCreateState" class="form-group"
ng-class="{'has-error' : AccountForm.number.$invalid && AccountForm.$submitted}">
<label class="control-label" translate>ACCOUNT.NUMBER</label>
<input class="form-control" ng-model="AccountEditCtrl.account.number" name="number" bh-integer required>
<input class="form-control" ng-model="AccountEditCtrl.account.number" autocomplete="off" name="number" bh-integer required>
<div class="help-block" ng-messages="AccountForm.number.$error" ng-show="AccountForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error' : AccountForm.label.$invalid && AccountForm.$submitted}">
<label class="control-label" translate>ACCOUNT.LABEL</label>
<input class="form-control" ng-model="AccountEditCtrl.account.label" name="label" required>
<input class="form-control" autocomplete="off" ng-model="AccountEditCtrl.account.label" name="label" required>
<div class="help-block" ng-messages="AccountForm.label.$error" ng-show="AccountForm.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<!-- name -->
<div class="form-group" ng-class="{ 'has-error' : CreditorGroupManager.$submitted && CreditorGroupManager.name.$invalid }">
<label class="control-label">{{ "FORM.LABELS.NAME" | translate }}</label>
<input class="form-control" name="name" type="text" ng-model="CreditorGroupCtrl.bundle.name" required>
<input class="form-control" name="name" type="text" autocomplete="off" ng-model="CreditorGroupCtrl.bundle.name" required>

<div class="help-block" ng-messages="CreditorGroupManager.name.$error" ng-show="CreditorGroupManager.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
Expand Down
2 changes: 2 additions & 0 deletions client/src/partials/billing_services/modal.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
<input
class="form-control"
name="label"
autocomplete="off"
ng-model="BillingServicesFormCtrl.model.label"
ng-maxlength="BillingServicesFormCtrl.length200"
required>
Expand Down Expand Up @@ -84,6 +85,7 @@
type="number"
class="form-control"
name="value"
autocomplete="off"
ng-model="BillingServicesFormCtrl.model.value"
ng-min="0"
required>
Expand Down
8 changes: 4 additions & 4 deletions client/src/partials/debtors/groups.update.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
class="form-group has-feedback"
ng-class="{'has-error' : debtorGroup.name.$invalid && debtorGroup.$submitted}">
<label class="control-label">{{ "FORM.LABELS.NAME" | translate }}</label>
<input name="name" ng-model="GroupUpdateCtrl.group.name" class="form-control" required>
<input name="name" ng-model="GroupUpdateCtrl.group.name" autocomplete="off" class="form-control" required>

<div class="help-block" ng-messages="debtorGroup.name.$error" ng-show="debtorGroup.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
Expand Down Expand Up @@ -80,7 +80,7 @@

<label class="control-label">{{ "FORM.LABELS.MAX_CREDIT" | translate }}</label>
<p class="text-info"><span class="fa fa-info-circle" aria-hidden="true"></span> {{ "FORM.LABELS.MAX_CREDIT_INFO" | translate }}</p>
<input type="number" ng-model="GroupUpdateCtrl.group.max_credit" name="max_credit" class="form-control" bh-integer required>
<input type="number" ng-model="GroupUpdateCtrl.group.max_credit" autocomplete="off" name="max_credit" class="form-control" bh-integer required>

<div class="help-block" ng-messages="debtorGroup.max_credit.$error" ng-show="debtorGroup.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
Expand All @@ -94,14 +94,14 @@

<div class="form-group">
<label class="control-label">{{ "FORM.LABELS.PHONE" | translate }}</label>
<input name="phone" ng-model="GroupUpdateCtrl.group.phone" class="form-control">
<input name="phone" ng-model="GroupUpdateCtrl.group.phone" autocomplete="off" class="form-control">
</div>

<div
class="form-group"
ng-class="{'has-error' : debtorGroup.email.$invalid && debtorGroup.$submitted}">
<label class="control-label">{{ "FORM.LABELS.EMAIL" | translate }}</label>
<input name="email" ng-model="GroupUpdateCtrl.group.email" type="email" class="form-control">
<input name="email" ng-model="GroupUpdateCtrl.group.email" type="email" autocomplete="off" class="form-control">

<div class="help-block" ng-messages="debtorGroup.email.$error" ng-show="debtorGroup.$submitted">
<div ng-messages-include="partials/templates/messages.tmpl.html"></div>
Expand Down
Loading

0 comments on commit c271664

Please sign in to comment.