Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Y
yamp
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
vaclab
yamp
Commits
ca755f74
Commit
ca755f74
authored
11 years ago
by
wactbprot
Browse files
Options
Downloads
Patches
Plain Diff
dform inputs sind jetzt sortable --> Reihenfolge der Inputs <-- Issue solved
parent
cc0b05ad
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
_attachments/vaclab/yamp.worker.js
+30
-21
30 additions, 21 deletions
_attachments/vaclab/yamp.worker.js
docs/ce3_calibration/_rev.str.txt
+1
-1
1 addition, 1 deletion
docs/ce3_calibration/_rev.str.txt
with
31 additions
and
22 deletions
_attachments/vaclab/yamp.worker.js
+
30
−
21
View file @
ca755f74
...
...
@@ -14,6 +14,8 @@
* This in the Form <pre>yamp_worker_demoWorker</pre>
* All the worker functions should be direct accessible with a
* task object or html id containing a .data() with the task.
*
* @author wactbprot thsteinbock@web.de
* @param {Object} app provided by jquery.couch.js
* @param {Object} YAMP inheritance object
* @return {Object} YAMP
...
...
@@ -89,13 +91,13 @@ var yamp_worker = function(app, YAMP){
*/
var
drawConnections
=
function
(
obj_or_id
,
cbFn
){
var
ret
=
YU
.
getData
(
obj_or_id
),
var
ret
=
YU
.
getData
(
obj_or_id
),
reqStruct
=
ret
.
reqStruct
,
currentId
=
ret
.
currentId
;
YU
.
setRunning
(
currentId
);
var
param
=
spec
.
Connection
.
EndPointParam
;
var
param
=
spec
.
Connection
.
EndPointParam
;
if
(
reqStruct
.
Value
&&
$
.
isArray
(
reqStruct
.
Value
)){
...
...
@@ -178,10 +180,10 @@ var yamp_worker = function(app, YAMP){
*/
var
alertMsg
=
function
(
obj_or_id
,
cbFn
){
var
ret
=
YU
.
getData
(
obj_or_id
),
var
ret
=
YU
.
getData
(
obj_or_id
),
reqStruct
=
ret
.
reqStruct
,
currentId
=
ret
.
currentId
;
YU
.
setRunning
(
currentId
);
if
(
reqStruct
.
Value
){
...
...
@@ -774,7 +776,7 @@ var yamp_worker = function(app, YAMP){
* the demanded html in dform json syntax.
* For documentation see:
* http://daffl.github.com/jquery.dform/
*
*
* The checkbox is mandatory:
* it keeps the task object
* (which contains e.g. the
...
...
@@ -801,9 +803,9 @@ var yamp_worker = function(app, YAMP){
* </pre>
* The Ids are:
* __appendToId__ : port_ini
* __dformId__ : dformport_ini_scMain_1_2_0
* (generated out of the dformDivContainer template)
*
* __dformId__ : dformport_ini_scMain_1_2_0
* (generated out of the dformDivContainer template)
*
* @author wactbprot
* @param obj_or_id object or html id
*/
...
...
@@ -815,25 +817,32 @@ var yamp_worker = function(app, YAMP){
appendToId
=
YU
.
checkId
(
reqStruct
.
AppendTo
)
?
reqStruct
.
AppendTo
:
spec
.
Ids
.
appendToFallback
,
dformId
=
spec
.
Prefixes
.
dform
+
appendToId
+
"
_
"
+
currentId
;
YU
.
setRunning
(
currentId
);
if
(
$
(
"
#
"
+
dformId
).
length
==
0
){
var
$divContainer
=
$
(
Templates
.
dformDivContainer
)
if
(
$
(
"
#
"
+
dformId
).
length
==
=
0
){
var
$divContainer
=
$
(
Templates
.
dformDivContainer
)
.
attr
(
"
id
"
,
dformId
)
.
addClass
(
spec
.
Classes
.
dyn
),
$dformChilds
=
$
(
"
#
"
+
appendToId
)
.
children
(
"
.
"
+
spec
.
Classes
.
dyn
);
if
(
$dformChilds
.
length
==
0
){
if
(
$dformChilds
.
length
==
=
0
){
$divContainer
.
appendTo
(
$
(
"
#
"
+
appendToId
));
.
appendTo
(
$
(
"
#
"
+
appendToId
));
}
else
{
$divContainer
.
insertBefore
(
$dformChilds
);
}
}
// ------------ dform call ----------
/*
* To change the order of the inputs (especially if two or more
* customer gauges are calibrated) these inputs are _.sortable()_.
*/
$divContainer
.
sortable
({
placeholder
:
"
ui-state-highlight
"
,
connectWith
:
"
#
"
+
appendToId
})
}
// ------------ dform call ----------
$
(
"
#
"
+
dformId
)
.
dform
(
reqStruct
.
Value
);
// ---------------------------------
...
...
@@ -1017,12 +1026,12 @@ var yamp_worker = function(app, YAMP){
reqUrl
,
appendToId
=
YU
.
checkId
(
reqStruct
.
AppendTo
)
?
reqStruct
.
AppendTo
:
spec
.
Ids
.
appendToFallback
;
YU
.
setRunning
(
currentId
);
if
(
reqStruct
.
ListName
&&
reqStruct
.
ViewName
){
if
(
reqStruct
.
UrlParams
){
for
(
var
i
in
reqStruct
.
UrlParams
){
urlparams
[
i
]
=
reqStruct
.
UrlParams
[
i
];
...
...
@@ -1066,8 +1075,8 @@ var yamp_worker = function(app, YAMP){
req
.
error
=
function
(
xhr
,
desc
,
err
){
var
logObj
=
JSON
.
parse
(
JSON
.
stringify
(
reqStruct
));
logObj
.
Error
=
{
xhr
:
xhr
,
desc
:
desc
,
logObj
.
Error
=
{
xhr
:
xhr
,
desc
:
desc
,
err
:
err
};
YL
.
writeToLogDb
(
logObj
);
};
...
...
This diff is collapsed.
Click to expand it.
docs/ce3_calibration/_rev.str.txt
+
1
−
1
View file @
ca755f74
514-4a583b8f708aa6e78bdea2ebc22433fc
\ No newline at end of file
403-30da65c078c66800cd9f4ac920ff1a2d
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment