Skip to content

Introduction of new property for the fields #1421

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

Introduction of new property for the fields #1421

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
4f96c86
Introduction of new property for the fields.
joabac Jan 20, 2023
7471488
property name change
joabac Jan 20, 2023
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
12 changes: 7 additions & 5 deletions demos/basic.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<script src="../src/fields/jsgrid.field.select.js"></script>
<script src="../src/fields/jsgrid.field.checkbox.js"></script>
<script src="../src/fields/jsgrid.field.control.js"></script>
<script src="../src/fields/jsgrid.field.textarea.js"></script>
</head>
<body>
<h1>Basic Scenario</h1>
Expand All @@ -44,11 +45,12 @@ <h1>Basic Scenario</h1>
deleteConfirm: "Do you really want to delete the client?",
controller: db,
fields: [
{ name: "Name", type: "text", width: 150 },
{ name: "Age", type: "number", width: 50 },
{ name: "Address", type: "text", width: 200 },
{ name: "Country", type: "select", items: db.countries, valueField: "Id", textField: "Name" },
{ name: "Married", type: "checkbox", title: "Is Married", sorting: false },
{ name: "Name", type: "text", width: 150, id:"id_name" },
{ name: "Data", type: "textarea", width: 150, id:"id_data" },
{ name: "Age", type: "number", width: 50 ,id:"id_age"},
{ name: "Address", type: "text", width: 200 , id:"id_address" },
{ name: "Country", type: "select", items: db.countries, valueField: "Id", textField: "Name" ,id:"id_country"},
{ name: "Married", type: "checkbox", title: "Is Married", sorting: false, id:"id_married" },
{ type: "control" }
]
});
Expand Down
74 changes: 49 additions & 25 deletions demos/db.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,171 +42,195 @@
db.clients = [
{
"Name": "Otto Clay",
"Age": 61,
"Age": 61,
"Country": 6,
"Address": "Ap #897-1459 Quam Avenue",
"Married": false
"Married": false,
"Data": "Excellent developer"
},
{
"Name": "Connor Johnston",
"Age": 73,
"Country": 7,
"Address": "Ap #370-4647 Dis Av.",
"Married": false
"Married": false,
"Data": "Excellent developer"
},
{
"Name": "Lacey Hess",
"Age": 29,
"Country": 7,
"Address": "Ap #365-8835 Integer St.",
"Married": false
"Married": false,
"Data": "Excellent developer"
},
{
"Name": "Timothy Henson",
"Age": 78,
"Country": 1,
"Address": "911-5143 Luctus Ave",
"Married": false
"Married": false,
"Data": "Excellent developer"
},
{
"Name": "Ramona Benton",
"Age": 43,
"Country": 5,
"Address": "Ap #614-689 Vehicula Street",
"Married": true
"Married": true,
"Data": "Excellent developer"
},
{
"Name": "Ezra Tillman",
"Age": 51,
"Country": 1,
"Address": "P.O. Box 738, 7583 Quisque St.",
"Married": true
"Married": true,
"Data": "Excellent developer"
},
{
"Name": "Dante Carter",
"Age": 59,
"Country": 1,
"Address": "P.O. Box 976, 6316 Lorem, St.",
"Married": false
"Married": false,
"Data": "Excellent developer"
},
{
"Name": "Christopher Mcclure",
"Age": 58,
"Country": 1,
"Address": "847-4303 Dictum Av.",
"Married": true
"Married": true,
"Data": "Excellent developer"
},
{
"Name": "Ruby Rocha",
"Age": 62,
"Country": 2,
"Address": "5212 Sagittis Ave",
"Married": false
"Married": false,
"Data": "Excellent developer"
},
{
"Name": "Imelda Hardin",
"Age": 39,
"Country": 5,
"Address": "719-7009 Auctor Av.",
"Married": false
"Married": false,
"Data": "Excellent developer"
},
{
"Name": "Jonah Johns",
"Age": 28,
"Country": 5,
"Address": "P.O. Box 939, 9310 A Ave",
"Married": false
"Married": false,
"Data": "Excellent developer"
},
{
"Name": "Herman Rosa",
"Age": 49,
"Country": 7,
"Address": "718-7162 Molestie Av.",
"Married": true
"Married": true,
"Data": "Excellent developer"
},
{
"Name": "Arthur Gay",
"Age": 20,
"Country": 7,
"Address": "5497 Neque Street",
"Married": false
"Married": false,
"Data": "Excellent developer"
},
{
"Name": "Xena Wilkerson",
"Age": 63,
"Country": 1,
"Address": "Ap #303-6974 Proin Street",
"Married": true
"Married": true,
"Data": "Excellent developer"
},
{
"Name": "Lilah Atkins",
"Age": 33,
"Country": 5,
"Address": "622-8602 Gravida Ave",
"Married": true
"Married": true,
"Data": "Excellent developer"
},
{
"Name": "Malik Shepard",
"Age": 59,
"Country": 1,
"Address": "967-5176 Tincidunt Av.",
"Married": false
"Married": false,
"Data": "Excellent developer"
},
{
"Name": "Keely Silva",
"Age": 24,
"Country": 1,
"Address": "P.O. Box 153, 8995 Praesent Ave",
"Married": false
"Married": false,
"Data": "Excellent developer"
},
{
"Name": "Hunter Pate",
"Age": 73,
"Country": 7,
"Address": "P.O. Box 771, 7599 Ante, Road",
"Married": false
"Married": false,
"Data": "Excellent developer"
},
{
"Name": "Mikayla Roach",
"Age": 55,
"Country": 5,
"Address": "Ap #438-9886 Donec Rd.",
"Married": true
"Married": true,
"Data": "Excellent developer"
},
{
"Name": "Upton Joseph",
"Age": 48,
"Country": 4,
"Address": "Ap #896-7592 Habitant St.",
"Married": true
"Married": true,
"Data": "Excellent developer"
},
{
"Name": "Jeanette Pate",
"Age": 59,
"Country": 2,
"Address": "P.O. Box 177, 7584 Amet, St.",
"Married": false
"Married": false,
"Data": "Excellent developer"
},
{
"Name": "Kaden Hernandez",
"Age": 79,
"Country": 3,
"Address": "366 Ut St.",
"Married": true
"Married": true,
"Data": "Excellent developer"
},
{
"Name": "Kenyon Stevens",
"Age": 20,
"Country": 3,
"Address": "P.O. Box 704, 4580 Gravida Rd.",
"Married": false
"Married": false,
"Data": "Excellent developer"
},
{
"Name": "Jerome Harper",
"Age": 31,
"Country": 5,
"Address": "2464 Porttitor Road",
"Married": false
"Married": false,
"Data": "Excellent developer"
},
{
"Name": "Jelani Patel",
Expand Down
17 changes: 12 additions & 5 deletions src/fields/jsgrid.field.checkbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
return "";

var grid = this._grid,
$result = this.filterControl = this._createCheckbox();
$result = this.filterControl = this._createCheckbox( (typeof(this.id) !== "undefined")?this.id+"_filter":"");

$result.prop({
readOnly: true,
Expand Down Expand Up @@ -61,14 +61,14 @@
if(!this.inserting)
return "";

return this.insertControl = this._createCheckbox();
return this.insertControl = this._createCheckbox((typeof(this.id) !== "undefined")?this.id+"_insert":"");
},

editTemplate: function(value) {
if(!this.editing)
return this.itemTemplate.apply(this, arguments);

var $result = this.editControl = this._createCheckbox();
var $result = this.editControl = this._createCheckbox((typeof(this.id) !== "undefined")?this.id+"_edit":"");
$result.prop("checked", value);
return $result;
},
Expand All @@ -87,8 +87,15 @@
return this.editControl.is(":checked");
},

_createCheckbox: function() {
return $("<input>").attr("type", "checkbox");
_createCheckbox: function(unId = "") {

var customField = $("<input>").attr("type", "checkbox");

if(unId !== "")
customField.attr("id",unId);

return customField;

}
});

Expand Down
14 changes: 11 additions & 3 deletions src/fields/jsgrid.field.number.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,17 @@
: undefined;
},

_createTextBox: function() {
return $("<input>").attr("type", "number")
.prop("readonly", !!this.readOnly);
_createTextBox: function(unId="") {


var customField = $("<input>").attr("type", "number")
.prop("readonly", !!this.readOnly);

if(unId !== "")
customField.attr("id",unId);

return customField;

}
});

Expand Down
12 changes: 8 additions & 4 deletions src/fields/jsgrid.field.select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
return "";

var grid = this._grid,
$result = this.filterControl = this._createSelect();
$result = this.filterControl = this._createSelect(typeof(this.id) !== "undefined"?this.id+"_filter":"");

if(this.autosearch) {
$result.on("change", function(e) {
Expand All @@ -65,14 +65,14 @@
if(!this.inserting)
return "";

return this.insertControl = this._createSelect();
return this.insertControl = this._createSelect(typeof(this.id) !== "undefined"?this.id+"_insert":"");
},

editTemplate: function(value) {
if(!this.editing)
return this.itemTemplate.apply(this, arguments);

var $result = this.editControl = this._createSelect();
var $result = this.editControl = this._createSelect(typeof(this.id) !== "undefined"?this.id+"_edit":"");
(value !== undefined) && $result.val(value);
return $result;
},
Expand All @@ -92,7 +92,8 @@
return this.valueType === numberValueType ? parseInt(val || 0, 10) : val;
},

_createSelect: function() {
_createSelect: function(unId = "" ) {

var $result = $("<select>"),
valueField = this.valueField,
textField = this.textField,
Expand All @@ -109,6 +110,9 @@

});

if(unId !== "")
$result.attr("id",unId);

$result.prop("disabled", !!this.readOnly);
$result.prop("selectedIndex", selectedIndex);

Expand Down
Loading