Skip to content

JSS Requirement addition #263

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.

Sign up for GitHub

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
piyushmadan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

JSS Requirement addition #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19577be
RAXAJSS-613 Religion fields/code uncommented
piyushmadan Nov 9, 2012
e63f89e
RegFeePayment(Paid/Credit) concept added in Reg Module
piyushmadan Nov 11, 2012
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
21 changes: 14 additions & 7 deletions src/registrationextjs4/app/controller/Main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ Ext.define('Registration.controller.Main', {
Ext.getCmp('educationConfirm').setText(Ext.getCmp('education').value);
Ext.getCmp('casteConfirm').setText(Ext.getCmp('caste').value);
Ext.getCmp('occupationConfirm').setText(Ext.getCmp('occupation').value);
// TODO: https://raxaemr.atlassian.net/browse/RAXAJSS-613
// Ext.getCmp('religionConfirm').setText(Ext.getCmp('religion').value);
Ext.getCmp('religionConfirm').setText(Ext.getCmp('religion').value);
Ext.getCmp('residentialAreaConfirm').setText(Ext.getCmp('residentialArea').value);
Ext.getCmp('stretConfirm').setText(Ext.getCmp('street').value);
if(!(!Ext.getCmp('patientPrimaryContact').value || Ext.getCmp('patientPrimaryContact').value === "")) {
Expand Down Expand Up @@ -234,8 +233,7 @@ Ext.define('Registration.controller.Main', {
{componentId: 'caste', uuid: localStorage.casteUuidpersonattributetype},
{componentId: 'education', uuid: localStorage.educationUuidpersonattributetype},
{componentId: 'occupation', uuid: localStorage.occupationUuidpersonattributetype},
// TODO: https://raxaemr.atlassian.net/browse/RAXAJSS-613
// {componentId: 'religion', uuid: localStorage.religionUuidpersonattributetype},
{componentId: 'religion', uuid: localStorage.religionUuidpersonattributetype},
{componentId: 'tehsil', uuid: localStorage.tehsilUuidpersonattributetype},
{componentId: 'district', uuid: localStorage.districtUuidpersonattributetype},
{componentId: 'patientPrimaryContact', uuid: localStorage.primaryContactUuidpersonattributetype},
Expand Down Expand Up @@ -494,6 +492,16 @@ Ext.define('Registration.controller.Main', {
});
jsonencounter.data.obs.push(jsonencounterregfee.data);
}
if(this._isOkToSendByREST('regFeePayment')) {
console.log("pushing obs.. regFeePayment");
var jsonencounterregfee = Ext.create('Registration.model.obsModel', {
obsDatetime: t,
person: localStorage.newPatientUuid,
concept: localStorage.regFeePaymentUuidconcept,
value: Ext.getCmp('regFeePayment').value
});
jsonencounter.data.obs.push(jsonencounterregfee.data);
}
if(this._isOkToSendByREST('complaintArea')) {
console.log("pushing obs.. complaintArea");
var jsonencountercomplaint = Ext.create('Registration.model.obsModel', {
Expand Down Expand Up @@ -555,11 +563,10 @@ Ext.define('Registration.controller.Main', {

//function which reset all the fields in new patient registertation form
_resetNewPatientRegistrationForm: function() {
// TODO: https://raxaemr.atlassian.net/browse/RAXAJSS-613
var fields = ['oldPatientIdentifier', 'patientFirstName', 'patientLastName', 'patientFirstNameHindi', 'patientLastNameHindi', 'relativeFirstName', 'relativeLastName', 'patientAge', 'dob', 'street', 'town', 'residentialArea', 'tehsil', 'district', 'state', 'patientPrimaryContact', 'patientSecondaryContact', 'education', 'caste', 'occupation', 'complaintArea', 'heightIDcm', 'weightIDkg', 'bmiNumberfieldID'];
var fields = ['oldPatientIdentifier', 'patientFirstName', 'patientLastName', 'patientFirstNameHindi', 'patientLastNameHindi', 'relativeFirstName', 'relativeLastName', 'patientAge', 'dob', 'street', 'town', 'residentialArea', 'tehsil', 'district', 'state', 'patientPrimaryContact', 'patientSecondaryContact', 'education', 'caste', 'occupation', 'complaintArea', 'heightIDcm', 'weightIDkg', 'bmiNumberfieldID','religion'];

for(var i = 0; i < fields.length; i++) {
Ext.getCmp(fields[i]).reset();
}
},
});
});
20 changes: 19 additions & 1 deletion src/registrationextjs4/app/view/IllnessDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,25 @@ Ext.define('Registration.view.IllnessDetails', {
value: 10,
hideTrigger: true,
allowBlank: false
}]
},
{
xtype: 'combo',
id: 'regFeePayment',
layout: 'hbox',
width: 175,
typeAhead: true,
minChars: 1,
queryMode: 'local',
value: 'Paid',
displayField: 'regFeePayment',
store: new Ext.data.SimpleStore({
fields: ['regFeePayment'],
data: [
['Paid'],
['Credit']

@piyushmadan piyushmadan Nov 11, 2012

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i18n library was not always loading.

]
})
}]
}]
},{
xtype: 'container',
Expand Down
4 changes: 2 additions & 2 deletions src/registrationextjs4/app/view/RaxaEmrReg_en-US.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ RaxaEmrReg.view.id.phone=Phone No
RaxaEmrReg.view.id.relation=Relation To Patient
RaxaEmrReg.view.id.title3=New Registration
RaxaEmrReg.view.id.RF=Registration Fees
RaxaEmrReg.view.id.collected=Fees Collected
RaxaEmrReg.view.id.credit=On Credit
RaxaEmrReg.view.id.collected=Paid
RaxaEmrReg.view.id.credit=Credit
RaxaEmrReg.view.id.back=Back
RaxaEmrReg.view.id.cancel=Cancel
RaxaEmrReg.view.id.next=Next
Expand Down
35 changes: 17 additions & 18 deletions src/registrationextjs4/app/view/RegistrationConfirm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,24 +309,23 @@ Ext.define('Registration.view.RegistrationConfirm', {
name: 'occuption',
id: 'occupationConfirm'
}]
// TODO: https://raxaemr.atlassian.net/browse/RAXAJSS-613
// }, {
// xtype: 'fieldcontainer',
// fieldLabel: Ext.i18n.appBundle.getMsg('RaxaEmrReg.view.rc.Religion'),
// layout: 'hbox',
// combineErrors: true,
// defaultType: 'text',
// labelAlign: 'right',
// labelPad: 20,
// labelWidth: 250,
// anchor: '95%',
// defaults: {
// hideLabel: 'true'
// },
// items: [{
// name: 'religion',
// id: 'religionConfirm'
// }]
}, {
xtype: 'fieldcontainer',
fieldLabel: Ext.i18n.appBundle.getMsg('RaxaEmrReg.view.rc.Religion'),
layout: 'hbox',
combineErrors: true,
defaultType: 'text',
labelAlign: 'right',
labelPad: 20,
labelWidth: 250,
anchor: '95%',
defaults: {
hideLabel: 'true'
},
items: [{
name: 'religion',
id: 'religionConfirm'
}]
}]
},{
xtype: 'container',
Expand Down
68 changes: 33 additions & 35 deletions src/registrationextjs4/app/view/RegistrationPart1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,41 +625,39 @@ Ext.define('Registration.view.RegistrationPart1', {

}]
}, {
// TODO: https://raxaemr.atlassian.net/browse/RAXAJSS-613
// xtype: 'fieldcontainer',
// fieldLabel: Ext.i18n.appBundle.getMsg('RaxaEmrReg.view.rp1.Religion'),
// layout: 'hbox',
// combineErrors: true,
// defaultType: 'textfield',
// labelAlign: 'right',
// labelPad: 20,
// labelWidth: 200,
// anchor: '95%',
// defaults: {
// hideLabel: 'true'
// },
// items: [{
// xtype: 'combo',
// name: 'religion',
// id: 'religion',
// layout: 'hbox',
// width: 172,
// typeAhead: true,
// minChars: 1,
// queryMode: 'local',
// store: new Ext.data.SimpleStore({
// fields: ['religion'],
// data: [
// [Ext.i18n.appBundle.getMsg('RaxaEmrReg.view.rp1.Religion.1')],
// [Ext.i18n.appBundle.getMsg('RaxaEmrReg.view.rp1.Religion.2')],
// [Ext.i18n.appBundle.getMsg('RaxaEmrReg.view.rp1.Religion.3')],
// [Ext.i18n.appBundle.getMsg('RaxaEmrReg.view.rp1.Religion.4')]
// ]
// }),
// displayField: 'religion'

// }]
// }, {
xtype: 'fieldcontainer',
fieldLabel: Ext.i18n.appBundle.getMsg('RaxaEmrReg.view.rp1.Religion'),
layout: 'hbox',
combineErrors: true,
defaultType: 'textfield',
labelAlign: 'right',
labelPad: 20,
labelWidth: 200,
anchor: '95%',
defaults: {
hideLabel: 'true'
},
items: [{
xtype: 'combo',
name: 'religion',
id: 'religion',
layout: 'hbox',
width: 172,
typeAhead: true,
minChars: 1,
queryMode: 'local',
store: new Ext.data.SimpleStore({
fields: ['religion'],
data: [
[Ext.i18n.appBundle.getMsg('RaxaEmrReg.view.rp1.Religion.1')],
[Ext.i18n.appBundle.getMsg('RaxaEmrReg.view.rp1.Religion.2')],
[Ext.i18n.appBundle.getMsg('RaxaEmrReg.view.rp1.Religion.3')],
[Ext.i18n.appBundle.getMsg('RaxaEmrReg.view.rp1.Religion.4')]
]
}),
displayField: 'religion'
}]
}, {
xtype: 'container',
layout: {
type: 'hbox',
Expand Down
43 changes: 21 additions & 22 deletions src/registrationextjs4/app/view/SearchConfirm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,28 +211,27 @@ Ext.define('Registration.view.SearchConfirm', {
flex: 1,
allowBlank: false
}]
// TODO: https://raxaemr.atlassian.net/browse/RAXAJSS-613
// }, {
// xtype: 'fieldcontainer',
// fieldLabel: Ext.i18n.appBundle.getMsg('RaxaEmrReg.view.sc.Religion'),
// layout: 'hbox',
// combineErrors: true,
// defaultType: 'textfield',
// labelAlign: 'right',
// labelPad: 20,
// labelWidth: 250,
// anchor: '95%',
// defaults: {
// hideLabel: 'true'
// },
// items: [{
// name: 'religion',
// id: 'religionSearchedPatient',
// emptyText: Ext.i18n.appBundle.getMsg('RaxaEmrReg.view.sc.Religion.emptytext'),
// readOnly: true,
// flex: 1,
// allowBlank: false
// }]
}, {
xtype: 'fieldcontainer',
fieldLabel: Ext.i18n.appBundle.getMsg('RaxaEmrReg.view.sc.Religion'),
layout: 'hbox',
combineErrors: true,
defaultType: 'textfield',
labelAlign: 'right',
labelPad: 20,
labelWidth: 250,
anchor: '95%',
defaults: {
hideLabel: 'true'
},
items: [{
name: 'religion',
id: 'religionSearchedPatient',
emptyText: Ext.i18n.appBundle.getMsg('RaxaEmrReg.view.sc.Religion.emptytext'),
readOnly: true,
flex: 1,
allowBlank: false
}]
}, {
xtype: 'textfield',
id: 'residentialAreaSearchedPatient',
Expand Down
13 changes: 5 additions & 8 deletions src/registrationextjs4/app/view/SearchPart2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,7 @@ Ext.define('Registration.view.SearchPart2', {
cellClick: {
fn: function () {
//All fields are initially set to '-' if data is not available, they remain same otherwise take respective values
// TODO: https://raxaemr.atlassian.net/browse/RAXAJSS-613
// 'religionSearchedPatient'
var itemsToReset = ['patientNameSearchedPatient','ageSearchedPatient','sexSearchedPatient','residentialAreaSearchedPatient','stretSearchedPatient','townSearchedPatient','oldPatientIdentifierSearchedPatient','occupationSearchedPatient','relativeNameSearchedPatient','tehsilSearchedPatient','secondaryContactNumberSearchedPatient','primaryContactNumberSearchedPatient','districtSearchedPatient','stateSearchedPatient','casteSearchedPatient','educationSearchedPatient'];
var itemsToReset = ['patientNameSearchedPatient','ageSearchedPatient','sexSearchedPatient','residentialAreaSearchedPatient','stretSearchedPatient','townSearchedPatient','oldPatientIdentifierSearchedPatient','occupationSearchedPatient','relativeNameSearchedPatient','tehsilSearchedPatient','secondaryContactNumberSearchedPatient','primaryContactNumberSearchedPatient','districtSearchedPatient','stateSearchedPatient','casteSearchedPatient','educationSearchedPatient','religionSearchedPatient'];
for(var j=0 ; j < itemsToReset.length ; j++)
{
Ext.getCmp(itemsToReset[j]).setValue('-');
Expand Down Expand Up @@ -165,11 +163,10 @@ Ext.define('Registration.view.SearchPart2', {
{
Ext.getCmp('educationSearchedPatient').setValue(temp.attributes[i].value);
}
// TODO: https://raxaemr.atlassian.net/browse/RAXAJSS-613
// if(temp.attributes[i].attributeType.display.search('Religion')>=0)
// {
// Ext.getCmp('religionSearchedPatient').setValue(temp.attributes[i].value);
// }
if(temp.attributes[i].attributeType.display.search('Religion')>=0)
{
Ext.getCmp('religionSearchedPatient').setValue(temp.attributes[i].value);
}
}
var l = Ext.getCmp('mainRegArea').getLayout();
l.setActiveItem(REG_PAGES.SEARCH_CONFIRM.value);
Expand Down
6 changes: 6 additions & 0 deletions src/resources/scripts/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ var resourceUuid = {
"varName": "regfee",
"displayName": "REGISTRATION FEE"
},
"regFeePayment": {
"resource": "concept",
"queryTerm": "regFeePayment",
"varName": "regFeePayment",
"displayName": "REGISTRATION FEE PAYMENT"
},
"systolicbloodpressure": {
"resource": "concept",
"queryTerm": "SYSTOLIC BLOOD PRESSURE",
Expand Down