Changeset 1309
- Timestamp:
- Dec 21, 2010, 4:42:03 PM (10 years ago)
- Location:
- trunk/grails-app
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/controllers/dbnp/studycapturing/StudyWizardController.groovy
r1304 r1309 271 271 studyPage(flow, flash, params) ? success() : error() 272 272 }.to "waitForSave" 273 on("toPageTwo") { 274 studyPage(flow, flash, params) ? success() : error() 275 }.to "subjects" 276 on("toPageThree") { 277 studyPage(flow, flash, params) ? success() : error() 278 }.to "events" 279 on("toPageFour") { 280 studyPage(flow, flash, params) ? success() : error() 281 }.to "samples" 282 on("toPageFive") { 283 studyPage(flow, flash, params) ? success() : error() 284 }.to "assays" 285 on("toPageSix") { 286 studyPage(flow, flash, params) ? success() : error() 287 }.to "confirm" 288 on("toPageSeven") { 289 studyPage(flow, flash, params) ? success() : error() 290 }.to "waitForSave" 273 291 } 274 292 … … 330 348 on("quickSave") { 331 349 // handle form data 350 subjectPage(flow, flash, params) ? success() : error() 351 }.to "waitForSave" 352 on("toPageOne") { 353 subjectPage(flow, flash, params) ? success() : error() 354 }.to "study" 355 on("toPageThree") { 356 subjectPage(flow, flash, params) ? success() : error() 357 }.to "events" 358 on("toPageFour") { 359 subjectPage(flow, flash, params) ? success() : error() 360 }.to "samples" 361 on("toPageFive") { 362 subjectPage(flow, flash, params) ? success() : error() 363 }.to "assays" 364 on("toPageSix") { 365 subjectPage(flow, flash, params) ? success() : error() 366 }.to "confirm" 367 on("toPageSeven") { 332 368 subjectPage(flow, flash, params) ? success() : error() 333 369 }.to "waitForSave" … … 538 574 eventPage(flow, flash, params) ? success() : error() 539 575 }.to "waitForSave" 576 on("toPageOne") { 577 eventPage(flow, flash, params) ? success() : error() 578 }.to "study" 579 on("toPageTwo") { 580 eventPage(flow, flash, params) ? success() : error() 581 }.to "subjects" 582 on("toPageFour") { 583 eventPage(flow, flash, params) ? success() : error() 584 }.to "samples" 585 on("toPageFive") { 586 eventPage(flow, flash, params) ? success() : error() 587 }.to "assays" 588 on("toPageSix") { 589 eventPage(flow, flash, params) ? success() : error() 590 }.to "confirm" 591 on("toPageSeven") { 592 eventPage(flow, flash, params) ? success() : error() 593 }.to "waitForSave" 540 594 } 541 595 … … 580 634 on("next").to "groups" 581 635 on("previous").to "events" 636 on("toPageOne") { 637 eventPage(flow, flash, params) ? success() : error() 638 }.to "study" 639 on("toPageTwo") { 640 eventPage(flow, flash, params) ? success() : error() 641 }.to "subjects" 642 on("toPageFour") { 643 eventPage(flow, flash, params) ? success() : error() 644 }.to "samples" 645 on("toPageFive") { 646 eventPage(flow, flash, params) ? success() : error() 647 }.to "assays" 648 on("toPageSix") { 649 eventPage(flow, flash, params) ? success() : error() 650 }.to "confirm" 651 on("toPageSeven") { 652 eventPage(flow, flash, params) ? success() : error() 653 }.to "waitForSave" 582 654 } 583 655 … … 604 676 groupPage(flow, flash, params) ? success() : error() 605 677 }.to "waitForSave" 678 on("toPageOne") { 679 groupPage(flow, flash, params) ? success() : error() 680 }.to "study" 681 on("toPageTwo") { 682 groupPage(flow, flash, params) ? success() : error() 683 }.to "subjects" 684 on("toPageFour") { 685 groupPage(flow, flash, params) ? success() : error() 686 }.to "samples" 687 on("toPageFive") { 688 groupPage(flow, flash, params) ? success() : error() 689 }.to "assays" 690 on("toPageSix") { 691 groupPage(flow, flash, params) ? success() : error() 692 }.to "confirm" 693 on("toPageSeven") { 694 groupPage(flow, flash, params) ? success() : error() 695 }.to "waitForSave" 606 696 } 607 697 … … 617 707 on("next").to "samples" 618 708 on("previous").to "groups" 709 on("toPageOne").to "study" 710 on("toPageTwo").to "subjects" 711 on("toPageThree").to "events" 712 on("toPageFive").to "assays" 713 on("toPageSix").to "confirm" 714 on("toPageSeven").to "waitForSave" 619 715 } 620 716 … … 681 777 on("quickSave") { 682 778 // handle form data 779 samplePage(flow, flash, params) ? success() : error() 780 }.to "waitForSave" 781 on("toPageOne") { 782 samplePage(flow, flash, params) ? success() : error() 783 }.to "study" 784 on("toPageTwo") { 785 samplePage(flow, flash, params) ? success() : error() 786 }.to "subjects" 787 on("toPageThree") { 788 samplePage(flow, flash, params) ? success() : error() 789 }.to "events" 790 on("toPageFive") { 791 samplePage(flow, flash, params) ? success() : error() 792 }.to "assays" 793 on("toPageSix") { 794 samplePage(flow, flash, params) ? success() : error() 795 }.to "confirm" 796 on("toPageSeven") { 683 797 samplePage(flow, flash, params) ? success() : error() 684 798 }.to "waitForSave" … … 792 906 assayPage(flow, flash, params) ? success() : error() 793 907 }.to "waitForSave" 908 on("toPageOne") { 909 assayPage(flow, flash, params) ? success() : error() 910 }.to "study" 911 on("toPageTwo") { 912 assayPage(flow, flash, params) ? success() : error() 913 }.to "subjects" 914 on("toPageThree") { 915 assayPage(flow, flash, params) ? success() : error() 916 }.to "events" 917 on("toPageFour") { 918 assayPage(flow, flash, params) ? success() : error() 919 }.to "samples" 920 on("toPageSix") { 921 assayPage(flow, flash, params) ? success() : error() 922 }.to "confirm" 923 on("toPageSeven") { 924 assayPage(flow, flash, params) ? success() : error() 925 }.to "waitForSave" 794 926 } 795 927 … … 838 970 on("quickSave") { 839 971 // handle form data 972 assayGroupPage(flow, flash, params) ? success() : error() 973 }.to "waitForSave" 974 on("toPageOne") { 975 assayGroupPage(flow, flash, params) ? success() : error() 976 }.to "study" 977 on("toPageTwo") { 978 assayGroupPage(flow, flash, params) ? success() : error() 979 }.to "subjects" 980 on("toPageThree") { 981 assayGroupPage(flow, flash, params) ? success() : error() 982 }.to "events" 983 on("toPageFour") { 984 assayGroupPage(flow, flash, params) ? success() : error() 985 }.to "samples" 986 on("toPageSix") { 987 assayGroupPage(flow, flash, params) ? success() : error() 988 }.to "confirm" 989 on("toPageSeven") { 840 990 assayGroupPage(flow, flash, params) ? success() : error() 841 991 }.to "waitForSave" … … 881 1031 on("next").to "waitForSave" 882 1032 on("quickSave").to "waitForSave" 1033 on("toPageOne").to "study" 1034 on("toPageTwo").to "subjects" 1035 on("toPageThree").to "events" 1036 on("toPageFour").to "samples" 1037 on("toPageFive").to "assays" 1038 on("toPageSeven").to "waitForSave" 883 1039 } 884 1040 … … 944 1100 on("next").to "waitForSave" 945 1101 on("previous").to "samples" 946 } 1102 on("toPageOne").to "study" 1103 on("toPageTwo").to "subjects" 1104 on("toPageThree").to "events" 1105 on("toPageFour").to "samples" 1106 on("toPageFive").to "assays" 1107 on("toPageSix").to "confirm" 1108 on("toPageSeven").to "waitForSave" } 947 1109 948 1110 // render finish page -
trunk/grails-app/views/studyWizard/common/_tabs.gsp
r1286 r1309 13 13 * $Author: duh $ 14 14 * $Date: 2010-12-08 15:12:54 +0100 (Wed, 08 Dec 2010) $ 15 *16 * clickable="true"17 15 */ 18 16 %> 19 <af:tabs pages="${pages}" page="${page}" />17 <af:tabs pages="${pages}" page="${page}" clickable="${study && study.getFieldValue('title')}" />
Note: See TracChangeset
for help on using the changeset viewer.