Index: lams_central/web/css/circle.css =================================================================== diff -u --- lams_central/web/css/circle.css (revision 0) +++ lams_central/web/css/circle.css (revision bbe9589ceab063d62380b9fe3f02648a4581e109) @@ -0,0 +1,1050 @@ +.rect-auto, +.c100.p51 .slice, +.c100.p52 .slice, +.c100.p53 .slice, +.c100.p54 .slice, +.c100.p55 .slice, +.c100.p56 .slice, +.c100.p57 .slice, +.c100.p58 .slice, +.c100.p59 .slice, +.c100.p60 .slice, +.c100.p61 .slice, +.c100.p62 .slice, +.c100.p63 .slice, +.c100.p64 .slice, +.c100.p65 .slice, +.c100.p66 .slice, +.c100.p67 .slice, +.c100.p68 .slice, +.c100.p69 .slice, +.c100.p70 .slice, +.c100.p71 .slice, +.c100.p72 .slice, +.c100.p73 .slice, +.c100.p74 .slice, +.c100.p75 .slice, +.c100.p76 .slice, +.c100.p77 .slice, +.c100.p78 .slice, +.c100.p79 .slice, +.c100.p80 .slice, +.c100.p81 .slice, +.c100.p82 .slice, +.c100.p83 .slice, +.c100.p84 .slice, +.c100.p85 .slice, +.c100.p86 .slice, +.c100.p87 .slice, +.c100.p88 .slice, +.c100.p89 .slice, +.c100.p90 .slice, +.c100.p91 .slice, +.c100.p92 .slice, +.c100.p93 .slice, +.c100.p94 .slice, +.c100.p95 .slice, +.c100.p96 .slice, +.c100.p97 .slice, +.c100.p98 .slice, +.c100.p99 .slice, +.c100.p100 .slice { + clip: rect(auto, auto, auto, auto); +} +.pie, +.c100 .bar, +.c100.p51 .fill, +.c100.p52 .fill, +.c100.p53 .fill, +.c100.p54 .fill, +.c100.p55 .fill, +.c100.p56 .fill, +.c100.p57 .fill, +.c100.p58 .fill, +.c100.p59 .fill, +.c100.p60 .fill, +.c100.p61 .fill, +.c100.p62 .fill, +.c100.p63 .fill, +.c100.p64 .fill, +.c100.p65 .fill, +.c100.p66 .fill, +.c100.p67 .fill, +.c100.p68 .fill, +.c100.p69 .fill, +.c100.p70 .fill, +.c100.p71 .fill, +.c100.p72 .fill, +.c100.p73 .fill, +.c100.p74 .fill, +.c100.p75 .fill, +.c100.p76 .fill, +.c100.p77 .fill, +.c100.p78 .fill, +.c100.p79 .fill, +.c100.p80 .fill, +.c100.p81 .fill, +.c100.p82 .fill, +.c100.p83 .fill, +.c100.p84 .fill, +.c100.p85 .fill, +.c100.p86 .fill, +.c100.p87 .fill, +.c100.p88 .fill, +.c100.p89 .fill, +.c100.p90 .fill, +.c100.p91 .fill, +.c100.p92 .fill, +.c100.p93 .fill, +.c100.p94 .fill, +.c100.p95 .fill, +.c100.p96 .fill, +.c100.p97 .fill, +.c100.p98 .fill, +.c100.p99 .fill, +.c100.p100 .fill { + position: absolute; + border: 0.08em solid #307bbb; + width: 0.84em; + height: 0.84em; + clip: rect(0em, 0.5em, 1em, 0em); + border-radius: 50%; + -webkit-transform: rotate(0deg); + -moz-transform: rotate(0deg); + -ms-transform: rotate(0deg); + -o-transform: rotate(0deg); + transform: rotate(0deg); +} +.pie-fill, +.c100.p51 .bar:after, +.c100.p51 .fill, +.c100.p52 .bar:after, +.c100.p52 .fill, +.c100.p53 .bar:after, +.c100.p53 .fill, +.c100.p54 .bar:after, +.c100.p54 .fill, +.c100.p55 .bar:after, +.c100.p55 .fill, +.c100.p56 .bar:after, +.c100.p56 .fill, +.c100.p57 .bar:after, +.c100.p57 .fill, +.c100.p58 .bar:after, +.c100.p58 .fill, +.c100.p59 .bar:after, +.c100.p59 .fill, +.c100.p60 .bar:after, +.c100.p60 .fill, +.c100.p61 .bar:after, +.c100.p61 .fill, +.c100.p62 .bar:after, +.c100.p62 .fill, +.c100.p63 .bar:after, +.c100.p63 .fill, +.c100.p64 .bar:after, +.c100.p64 .fill, +.c100.p65 .bar:after, +.c100.p65 .fill, +.c100.p66 .bar:after, +.c100.p66 .fill, +.c100.p67 .bar:after, +.c100.p67 .fill, +.c100.p68 .bar:after, +.c100.p68 .fill, +.c100.p69 .bar:after, +.c100.p69 .fill, +.c100.p70 .bar:after, +.c100.p70 .fill, +.c100.p71 .bar:after, +.c100.p71 .fill, +.c100.p72 .bar:after, +.c100.p72 .fill, +.c100.p73 .bar:after, +.c100.p73 .fill, +.c100.p74 .bar:after, +.c100.p74 .fill, +.c100.p75 .bar:after, +.c100.p75 .fill, +.c100.p76 .bar:after, +.c100.p76 .fill, +.c100.p77 .bar:after, +.c100.p77 .fill, +.c100.p78 .bar:after, +.c100.p78 .fill, +.c100.p79 .bar:after, +.c100.p79 .fill, +.c100.p80 .bar:after, +.c100.p80 .fill, +.c100.p81 .bar:after, +.c100.p81 .fill, +.c100.p82 .bar:after, +.c100.p82 .fill, +.c100.p83 .bar:after, +.c100.p83 .fill, +.c100.p84 .bar:after, +.c100.p84 .fill, +.c100.p85 .bar:after, +.c100.p85 .fill, +.c100.p86 .bar:after, +.c100.p86 .fill, +.c100.p87 .bar:after, +.c100.p87 .fill, +.c100.p88 .bar:after, +.c100.p88 .fill, +.c100.p89 .bar:after, +.c100.p89 .fill, +.c100.p90 .bar:after, +.c100.p90 .fill, +.c100.p91 .bar:after, +.c100.p91 .fill, +.c100.p92 .bar:after, +.c100.p92 .fill, +.c100.p93 .bar:after, +.c100.p93 .fill, +.c100.p94 .bar:after, +.c100.p94 .fill, +.c100.p95 .bar:after, +.c100.p95 .fill, +.c100.p96 .bar:after, +.c100.p96 .fill, +.c100.p97 .bar:after, +.c100.p97 .fill, +.c100.p98 .bar:after, +.c100.p98 .fill, +.c100.p99 .bar:after, +.c100.p99 .fill, +.c100.p100 .bar:after, +.c100.p100 .fill { + -webkit-transform: rotate(180deg); + -moz-transform: rotate(180deg); + -ms-transform: rotate(180deg); + -o-transform: rotate(180deg); + transform: rotate(180deg); +} +.c100 { + position: relative; + font-size: 120px; + width: 1em; + height: 1em; + border-radius: 50%; + float: left; + margin: 0 0.1em 0.1em 0; + background-color: #cccccc; +} +.c100 *, +.c100 *:before, +.c100 *:after { + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} +.c100.center { + float: none; + margin: 0 auto; +} +.c100.big { + font-size: 240px; +} +.c100.small { + font-size: 80px; +} +.c100 > span { + position: absolute; + width: 100%; + z-index: 1; + left: 0; + top: 0; + width: 5em; + line-height: 5em; + font-size: 0.2em; + color: #cccccc; + display: block; + text-align: center; + white-space: nowrap; + -webkit-transition-property: all; + -moz-transition-property: all; + -o-transition-property: all; + transition-property: all; + -webkit-transition-duration: 0.2s; + -moz-transition-duration: 0.2s; + -o-transition-duration: 0.2s; + transition-duration: 0.2s; + -webkit-transition-timing-function: ease-out; + -moz-transition-timing-function: ease-out; + -o-transition-timing-function: ease-out; + transition-timing-function: ease-out; +} +.c100:after { + position: absolute; + top: 0.08em; + left: 0.08em; + display: block; + content: " "; + border-radius: 50%; + background-color: #f5f5f5; + width: 0.84em; + height: 0.84em; + -webkit-transition-property: all; + -moz-transition-property: all; + -o-transition-property: all; + transition-property: all; + -webkit-transition-duration: 0.2s; + -moz-transition-duration: 0.2s; + -o-transition-duration: 0.2s; + transition-duration: 0.2s; + -webkit-transition-timing-function: ease-in; + -moz-transition-timing-function: ease-in; + -o-transition-timing-function: ease-in; + transition-timing-function: ease-in; +} +.c100 .slice { + position: absolute; + width: 1em; + height: 1em; + clip: rect(0em, 1em, 1em, 0.5em); +} +.c100.p1 .bar { + -webkit-transform: rotate(3.6deg); + -moz-transform: rotate(3.6deg); + -ms-transform: rotate(3.6deg); + -o-transform: rotate(3.6deg); + transform: rotate(3.6deg); +} +.c100.p2 .bar { + -webkit-transform: rotate(7.2deg); + -moz-transform: rotate(7.2deg); + -ms-transform: rotate(7.2deg); + -o-transform: rotate(7.2deg); + transform: rotate(7.2deg); +} +.c100.p3 .bar { + -webkit-transform: rotate(10.8deg); + -moz-transform: rotate(10.8deg); + -ms-transform: rotate(10.8deg); + -o-transform: rotate(10.8deg); + transform: rotate(10.8deg); +} +.c100.p4 .bar { + -webkit-transform: rotate(14.4deg); + -moz-transform: rotate(14.4deg); + -ms-transform: rotate(14.4deg); + -o-transform: rotate(14.4deg); + transform: rotate(14.4deg); +} +.c100.p5 .bar { + -webkit-transform: rotate(18deg); + -moz-transform: rotate(18deg); + -ms-transform: rotate(18deg); + -o-transform: rotate(18deg); + transform: rotate(18deg); +} +.c100.p6 .bar { + -webkit-transform: rotate(21.6deg); + -moz-transform: rotate(21.6deg); + -ms-transform: rotate(21.6deg); + -o-transform: rotate(21.6deg); + transform: rotate(21.6deg); +} +.c100.p7 .bar { + -webkit-transform: rotate(25.2deg); + -moz-transform: rotate(25.2deg); + -ms-transform: rotate(25.2deg); + -o-transform: rotate(25.2deg); + transform: rotate(25.2deg); +} +.c100.p8 .bar { + -webkit-transform: rotate(28.8deg); + -moz-transform: rotate(28.8deg); + -ms-transform: rotate(28.8deg); + -o-transform: rotate(28.8deg); + transform: rotate(28.8deg); +} +.c100.p9 .bar { + -webkit-transform: rotate(32.4deg); + -moz-transform: rotate(32.4deg); + -ms-transform: rotate(32.4deg); + -o-transform: rotate(32.4deg); + transform: rotate(32.4deg); +} +.c100.p10 .bar { + -webkit-transform: rotate(36deg); + -moz-transform: rotate(36deg); + -ms-transform: rotate(36deg); + -o-transform: rotate(36deg); + transform: rotate(36deg); +} +.c100.p11 .bar { + -webkit-transform: rotate(39.6deg); + -moz-transform: rotate(39.6deg); + -ms-transform: rotate(39.6deg); + -o-transform: rotate(39.6deg); + transform: rotate(39.6deg); +} +.c100.p12 .bar { + -webkit-transform: rotate(43.2deg); + -moz-transform: rotate(43.2deg); + -ms-transform: rotate(43.2deg); + -o-transform: rotate(43.2deg); + transform: rotate(43.2deg); +} +.c100.p13 .bar { + -webkit-transform: rotate(46.800000000000004deg); + -moz-transform: rotate(46.800000000000004deg); + -ms-transform: rotate(46.800000000000004deg); + -o-transform: rotate(46.800000000000004deg); + transform: rotate(46.800000000000004deg); +} +.c100.p14 .bar { + -webkit-transform: rotate(50.4deg); + -moz-transform: rotate(50.4deg); + -ms-transform: rotate(50.4deg); + -o-transform: rotate(50.4deg); + transform: rotate(50.4deg); +} +.c100.p15 .bar { + -webkit-transform: rotate(54deg); + -moz-transform: rotate(54deg); + -ms-transform: rotate(54deg); + -o-transform: rotate(54deg); + transform: rotate(54deg); +} +.c100.p16 .bar { + -webkit-transform: rotate(57.6deg); + -moz-transform: rotate(57.6deg); + -ms-transform: rotate(57.6deg); + -o-transform: rotate(57.6deg); + transform: rotate(57.6deg); +} +.c100.p17 .bar { + -webkit-transform: rotate(61.2deg); + -moz-transform: rotate(61.2deg); + -ms-transform: rotate(61.2deg); + -o-transform: rotate(61.2deg); + transform: rotate(61.2deg); +} +.c100.p18 .bar { + -webkit-transform: rotate(64.8deg); + -moz-transform: rotate(64.8deg); + -ms-transform: rotate(64.8deg); + -o-transform: rotate(64.8deg); + transform: rotate(64.8deg); +} +.c100.p19 .bar { + -webkit-transform: rotate(68.4deg); + -moz-transform: rotate(68.4deg); + -ms-transform: rotate(68.4deg); + -o-transform: rotate(68.4deg); + transform: rotate(68.4deg); +} +.c100.p20 .bar { + -webkit-transform: rotate(72deg); + -moz-transform: rotate(72deg); + -ms-transform: rotate(72deg); + -o-transform: rotate(72deg); + transform: rotate(72deg); +} +.c100.p21 .bar { + -webkit-transform: rotate(75.60000000000001deg); + -moz-transform: rotate(75.60000000000001deg); + -ms-transform: rotate(75.60000000000001deg); + -o-transform: rotate(75.60000000000001deg); + transform: rotate(75.60000000000001deg); +} +.c100.p22 .bar { + -webkit-transform: rotate(79.2deg); + -moz-transform: rotate(79.2deg); + -ms-transform: rotate(79.2deg); + -o-transform: rotate(79.2deg); + transform: rotate(79.2deg); +} +.c100.p23 .bar { + -webkit-transform: rotate(82.8deg); + -moz-transform: rotate(82.8deg); + -ms-transform: rotate(82.8deg); + -o-transform: rotate(82.8deg); + transform: rotate(82.8deg); +} +.c100.p24 .bar { + -webkit-transform: rotate(86.4deg); + -moz-transform: rotate(86.4deg); + -ms-transform: rotate(86.4deg); + -o-transform: rotate(86.4deg); + transform: rotate(86.4deg); +} +.c100.p25 .bar { + -webkit-transform: rotate(90deg); + -moz-transform: rotate(90deg); + -ms-transform: rotate(90deg); + -o-transform: rotate(90deg); + transform: rotate(90deg); +} +.c100.p26 .bar { + -webkit-transform: rotate(93.60000000000001deg); + -moz-transform: rotate(93.60000000000001deg); + -ms-transform: rotate(93.60000000000001deg); + -o-transform: rotate(93.60000000000001deg); + transform: rotate(93.60000000000001deg); +} +.c100.p27 .bar { + -webkit-transform: rotate(97.2deg); + -moz-transform: rotate(97.2deg); + -ms-transform: rotate(97.2deg); + -o-transform: rotate(97.2deg); + transform: rotate(97.2deg); +} +.c100.p28 .bar { + -webkit-transform: rotate(100.8deg); + -moz-transform: rotate(100.8deg); + -ms-transform: rotate(100.8deg); + -o-transform: rotate(100.8deg); + transform: rotate(100.8deg); +} +.c100.p29 .bar { + -webkit-transform: rotate(104.4deg); + -moz-transform: rotate(104.4deg); + -ms-transform: rotate(104.4deg); + -o-transform: rotate(104.4deg); + transform: rotate(104.4deg); +} +.c100.p30 .bar { + -webkit-transform: rotate(108deg); + -moz-transform: rotate(108deg); + -ms-transform: rotate(108deg); + -o-transform: rotate(108deg); + transform: rotate(108deg); +} +.c100.p31 .bar { + -webkit-transform: rotate(111.60000000000001deg); + -moz-transform: rotate(111.60000000000001deg); + -ms-transform: rotate(111.60000000000001deg); + -o-transform: rotate(111.60000000000001deg); + transform: rotate(111.60000000000001deg); +} +.c100.p32 .bar { + -webkit-transform: rotate(115.2deg); + -moz-transform: rotate(115.2deg); + -ms-transform: rotate(115.2deg); + -o-transform: rotate(115.2deg); + transform: rotate(115.2deg); +} +.c100.p33 .bar { + -webkit-transform: rotate(118.8deg); + -moz-transform: rotate(118.8deg); + -ms-transform: rotate(118.8deg); + -o-transform: rotate(118.8deg); + transform: rotate(118.8deg); +} +.c100.p34 .bar { + -webkit-transform: rotate(122.4deg); + -moz-transform: rotate(122.4deg); + -ms-transform: rotate(122.4deg); + -o-transform: rotate(122.4deg); + transform: rotate(122.4deg); +} +.c100.p35 .bar { + -webkit-transform: rotate(126deg); + -moz-transform: rotate(126deg); + -ms-transform: rotate(126deg); + -o-transform: rotate(126deg); + transform: rotate(126deg); +} +.c100.p36 .bar { + -webkit-transform: rotate(129.6deg); + -moz-transform: rotate(129.6deg); + -ms-transform: rotate(129.6deg); + -o-transform: rotate(129.6deg); + transform: rotate(129.6deg); +} +.c100.p37 .bar { + -webkit-transform: rotate(133.20000000000002deg); + -moz-transform: rotate(133.20000000000002deg); + -ms-transform: rotate(133.20000000000002deg); + -o-transform: rotate(133.20000000000002deg); + transform: rotate(133.20000000000002deg); +} +.c100.p38 .bar { + -webkit-transform: rotate(136.8deg); + -moz-transform: rotate(136.8deg); + -ms-transform: rotate(136.8deg); + -o-transform: rotate(136.8deg); + transform: rotate(136.8deg); +} +.c100.p39 .bar { + -webkit-transform: rotate(140.4deg); + -moz-transform: rotate(140.4deg); + -ms-transform: rotate(140.4deg); + -o-transform: rotate(140.4deg); + transform: rotate(140.4deg); +} +.c100.p40 .bar { + -webkit-transform: rotate(144deg); + -moz-transform: rotate(144deg); + -ms-transform: rotate(144deg); + -o-transform: rotate(144deg); + transform: rotate(144deg); +} +.c100.p41 .bar { + -webkit-transform: rotate(147.6deg); + -moz-transform: rotate(147.6deg); + -ms-transform: rotate(147.6deg); + -o-transform: rotate(147.6deg); + transform: rotate(147.6deg); +} +.c100.p42 .bar { + -webkit-transform: rotate(151.20000000000002deg); + -moz-transform: rotate(151.20000000000002deg); + -ms-transform: rotate(151.20000000000002deg); + -o-transform: rotate(151.20000000000002deg); + transform: rotate(151.20000000000002deg); +} +.c100.p43 .bar { + -webkit-transform: rotate(154.8deg); + -moz-transform: rotate(154.8deg); + -ms-transform: rotate(154.8deg); + -o-transform: rotate(154.8deg); + transform: rotate(154.8deg); +} +.c100.p44 .bar { + -webkit-transform: rotate(158.4deg); + -moz-transform: rotate(158.4deg); + -ms-transform: rotate(158.4deg); + -o-transform: rotate(158.4deg); + transform: rotate(158.4deg); +} +.c100.p45 .bar { + -webkit-transform: rotate(162deg); + -moz-transform: rotate(162deg); + -ms-transform: rotate(162deg); + -o-transform: rotate(162deg); + transform: rotate(162deg); +} +.c100.p46 .bar { + -webkit-transform: rotate(165.6deg); + -moz-transform: rotate(165.6deg); + -ms-transform: rotate(165.6deg); + -o-transform: rotate(165.6deg); + transform: rotate(165.6deg); +} +.c100.p47 .bar { + -webkit-transform: rotate(169.20000000000002deg); + -moz-transform: rotate(169.20000000000002deg); + -ms-transform: rotate(169.20000000000002deg); + -o-transform: rotate(169.20000000000002deg); + transform: rotate(169.20000000000002deg); +} +.c100.p48 .bar { + -webkit-transform: rotate(172.8deg); + -moz-transform: rotate(172.8deg); + -ms-transform: rotate(172.8deg); + -o-transform: rotate(172.8deg); + transform: rotate(172.8deg); +} +.c100.p49 .bar { + -webkit-transform: rotate(176.4deg); + -moz-transform: rotate(176.4deg); + -ms-transform: rotate(176.4deg); + -o-transform: rotate(176.4deg); + transform: rotate(176.4deg); +} +.c100.p50 .bar { + -webkit-transform: rotate(180deg); + -moz-transform: rotate(180deg); + -ms-transform: rotate(180deg); + -o-transform: rotate(180deg); + transform: rotate(180deg); +} +.c100.p51 .bar { + -webkit-transform: rotate(183.6deg); + -moz-transform: rotate(183.6deg); + -ms-transform: rotate(183.6deg); + -o-transform: rotate(183.6deg); + transform: rotate(183.6deg); +} +.c100.p52 .bar { + -webkit-transform: rotate(187.20000000000002deg); + -moz-transform: rotate(187.20000000000002deg); + -ms-transform: rotate(187.20000000000002deg); + -o-transform: rotate(187.20000000000002deg); + transform: rotate(187.20000000000002deg); +} +.c100.p53 .bar { + -webkit-transform: rotate(190.8deg); + -moz-transform: rotate(190.8deg); + -ms-transform: rotate(190.8deg); + -o-transform: rotate(190.8deg); + transform: rotate(190.8deg); +} +.c100.p54 .bar { + -webkit-transform: rotate(194.4deg); + -moz-transform: rotate(194.4deg); + -ms-transform: rotate(194.4deg); + -o-transform: rotate(194.4deg); + transform: rotate(194.4deg); +} +.c100.p55 .bar { + -webkit-transform: rotate(198deg); + -moz-transform: rotate(198deg); + -ms-transform: rotate(198deg); + -o-transform: rotate(198deg); + transform: rotate(198deg); +} +.c100.p56 .bar { + -webkit-transform: rotate(201.6deg); + -moz-transform: rotate(201.6deg); + -ms-transform: rotate(201.6deg); + -o-transform: rotate(201.6deg); + transform: rotate(201.6deg); +} +.c100.p57 .bar { + -webkit-transform: rotate(205.20000000000002deg); + -moz-transform: rotate(205.20000000000002deg); + -ms-transform: rotate(205.20000000000002deg); + -o-transform: rotate(205.20000000000002deg); + transform: rotate(205.20000000000002deg); +} +.c100.p58 .bar { + -webkit-transform: rotate(208.8deg); + -moz-transform: rotate(208.8deg); + -ms-transform: rotate(208.8deg); + -o-transform: rotate(208.8deg); + transform: rotate(208.8deg); +} +.c100.p59 .bar { + -webkit-transform: rotate(212.4deg); + -moz-transform: rotate(212.4deg); + -ms-transform: rotate(212.4deg); + -o-transform: rotate(212.4deg); + transform: rotate(212.4deg); +} +.c100.p60 .bar { + -webkit-transform: rotate(216deg); + -moz-transform: rotate(216deg); + -ms-transform: rotate(216deg); + -o-transform: rotate(216deg); + transform: rotate(216deg); +} +.c100.p61 .bar { + -webkit-transform: rotate(219.6deg); + -moz-transform: rotate(219.6deg); + -ms-transform: rotate(219.6deg); + -o-transform: rotate(219.6deg); + transform: rotate(219.6deg); +} +.c100.p62 .bar { + -webkit-transform: rotate(223.20000000000002deg); + -moz-transform: rotate(223.20000000000002deg); + -ms-transform: rotate(223.20000000000002deg); + -o-transform: rotate(223.20000000000002deg); + transform: rotate(223.20000000000002deg); +} +.c100.p63 .bar { + -webkit-transform: rotate(226.8deg); + -moz-transform: rotate(226.8deg); + -ms-transform: rotate(226.8deg); + -o-transform: rotate(226.8deg); + transform: rotate(226.8deg); +} +.c100.p64 .bar { + -webkit-transform: rotate(230.4deg); + -moz-transform: rotate(230.4deg); + -ms-transform: rotate(230.4deg); + -o-transform: rotate(230.4deg); + transform: rotate(230.4deg); +} +.c100.p65 .bar { + -webkit-transform: rotate(234deg); + -moz-transform: rotate(234deg); + -ms-transform: rotate(234deg); + -o-transform: rotate(234deg); + transform: rotate(234deg); +} +.c100.p66 .bar { + -webkit-transform: rotate(237.6deg); + -moz-transform: rotate(237.6deg); + -ms-transform: rotate(237.6deg); + -o-transform: rotate(237.6deg); + transform: rotate(237.6deg); +} +.c100.p67 .bar { + -webkit-transform: rotate(241.20000000000002deg); + -moz-transform: rotate(241.20000000000002deg); + -ms-transform: rotate(241.20000000000002deg); + -o-transform: rotate(241.20000000000002deg); + transform: rotate(241.20000000000002deg); +} +.c100.p68 .bar { + -webkit-transform: rotate(244.8deg); + -moz-transform: rotate(244.8deg); + -ms-transform: rotate(244.8deg); + -o-transform: rotate(244.8deg); + transform: rotate(244.8deg); +} +.c100.p69 .bar { + -webkit-transform: rotate(248.4deg); + -moz-transform: rotate(248.4deg); + -ms-transform: rotate(248.4deg); + -o-transform: rotate(248.4deg); + transform: rotate(248.4deg); +} +.c100.p70 .bar { + -webkit-transform: rotate(252deg); + -moz-transform: rotate(252deg); + -ms-transform: rotate(252deg); + -o-transform: rotate(252deg); + transform: rotate(252deg); +} +.c100.p71 .bar { + -webkit-transform: rotate(255.6deg); + -moz-transform: rotate(255.6deg); + -ms-transform: rotate(255.6deg); + -o-transform: rotate(255.6deg); + transform: rotate(255.6deg); +} +.c100.p72 .bar { + -webkit-transform: rotate(259.2deg); + -moz-transform: rotate(259.2deg); + -ms-transform: rotate(259.2deg); + -o-transform: rotate(259.2deg); + transform: rotate(259.2deg); +} +.c100.p73 .bar { + -webkit-transform: rotate(262.8deg); + -moz-transform: rotate(262.8deg); + -ms-transform: rotate(262.8deg); + -o-transform: rotate(262.8deg); + transform: rotate(262.8deg); +} +.c100.p74 .bar { + -webkit-transform: rotate(266.40000000000003deg); + -moz-transform: rotate(266.40000000000003deg); + -ms-transform: rotate(266.40000000000003deg); + -o-transform: rotate(266.40000000000003deg); + transform: rotate(266.40000000000003deg); +} +.c100.p75 .bar { + -webkit-transform: rotate(270deg); + -moz-transform: rotate(270deg); + -ms-transform: rotate(270deg); + -o-transform: rotate(270deg); + transform: rotate(270deg); +} +.c100.p76 .bar { + -webkit-transform: rotate(273.6deg); + -moz-transform: rotate(273.6deg); + -ms-transform: rotate(273.6deg); + -o-transform: rotate(273.6deg); + transform: rotate(273.6deg); +} +.c100.p77 .bar { + -webkit-transform: rotate(277.2deg); + -moz-transform: rotate(277.2deg); + -ms-transform: rotate(277.2deg); + -o-transform: rotate(277.2deg); + transform: rotate(277.2deg); +} +.c100.p78 .bar { + -webkit-transform: rotate(280.8deg); + -moz-transform: rotate(280.8deg); + -ms-transform: rotate(280.8deg); + -o-transform: rotate(280.8deg); + transform: rotate(280.8deg); +} +.c100.p79 .bar { + -webkit-transform: rotate(284.40000000000003deg); + -moz-transform: rotate(284.40000000000003deg); + -ms-transform: rotate(284.40000000000003deg); + -o-transform: rotate(284.40000000000003deg); + transform: rotate(284.40000000000003deg); +} +.c100.p80 .bar { + -webkit-transform: rotate(288deg); + -moz-transform: rotate(288deg); + -ms-transform: rotate(288deg); + -o-transform: rotate(288deg); + transform: rotate(288deg); +} +.c100.p81 .bar { + -webkit-transform: rotate(291.6deg); + -moz-transform: rotate(291.6deg); + -ms-transform: rotate(291.6deg); + -o-transform: rotate(291.6deg); + transform: rotate(291.6deg); +} +.c100.p82 .bar { + -webkit-transform: rotate(295.2deg); + -moz-transform: rotate(295.2deg); + -ms-transform: rotate(295.2deg); + -o-transform: rotate(295.2deg); + transform: rotate(295.2deg); +} +.c100.p83 .bar { + -webkit-transform: rotate(298.8deg); + -moz-transform: rotate(298.8deg); + -ms-transform: rotate(298.8deg); + -o-transform: rotate(298.8deg); + transform: rotate(298.8deg); +} +.c100.p84 .bar { + -webkit-transform: rotate(302.40000000000003deg); + -moz-transform: rotate(302.40000000000003deg); + -ms-transform: rotate(302.40000000000003deg); + -o-transform: rotate(302.40000000000003deg); + transform: rotate(302.40000000000003deg); +} +.c100.p85 .bar { + -webkit-transform: rotate(306deg); + -moz-transform: rotate(306deg); + -ms-transform: rotate(306deg); + -o-transform: rotate(306deg); + transform: rotate(306deg); +} +.c100.p86 .bar { + -webkit-transform: rotate(309.6deg); + -moz-transform: rotate(309.6deg); + -ms-transform: rotate(309.6deg); + -o-transform: rotate(309.6deg); + transform: rotate(309.6deg); +} +.c100.p87 .bar { + -webkit-transform: rotate(313.2deg); + -moz-transform: rotate(313.2deg); + -ms-transform: rotate(313.2deg); + -o-transform: rotate(313.2deg); + transform: rotate(313.2deg); +} +.c100.p88 .bar { + -webkit-transform: rotate(316.8deg); + -moz-transform: rotate(316.8deg); + -ms-transform: rotate(316.8deg); + -o-transform: rotate(316.8deg); + transform: rotate(316.8deg); +} +.c100.p89 .bar { + -webkit-transform: rotate(320.40000000000003deg); + -moz-transform: rotate(320.40000000000003deg); + -ms-transform: rotate(320.40000000000003deg); + -o-transform: rotate(320.40000000000003deg); + transform: rotate(320.40000000000003deg); +} +.c100.p90 .bar { + -webkit-transform: rotate(324deg); + -moz-transform: rotate(324deg); + -ms-transform: rotate(324deg); + -o-transform: rotate(324deg); + transform: rotate(324deg); +} +.c100.p91 .bar { + -webkit-transform: rotate(327.6deg); + -moz-transform: rotate(327.6deg); + -ms-transform: rotate(327.6deg); + -o-transform: rotate(327.6deg); + transform: rotate(327.6deg); +} +.c100.p92 .bar { + -webkit-transform: rotate(331.2deg); + -moz-transform: rotate(331.2deg); + -ms-transform: rotate(331.2deg); + -o-transform: rotate(331.2deg); + transform: rotate(331.2deg); +} +.c100.p93 .bar { + -webkit-transform: rotate(334.8deg); + -moz-transform: rotate(334.8deg); + -ms-transform: rotate(334.8deg); + -o-transform: rotate(334.8deg); + transform: rotate(334.8deg); +} +.c100.p94 .bar { + -webkit-transform: rotate(338.40000000000003deg); + -moz-transform: rotate(338.40000000000003deg); + -ms-transform: rotate(338.40000000000003deg); + -o-transform: rotate(338.40000000000003deg); + transform: rotate(338.40000000000003deg); +} +.c100.p95 .bar { + -webkit-transform: rotate(342deg); + -moz-transform: rotate(342deg); + -ms-transform: rotate(342deg); + -o-transform: rotate(342deg); + transform: rotate(342deg); +} +.c100.p96 .bar { + -webkit-transform: rotate(345.6deg); + -moz-transform: rotate(345.6deg); + -ms-transform: rotate(345.6deg); + -o-transform: rotate(345.6deg); + transform: rotate(345.6deg); +} +.c100.p97 .bar { + -webkit-transform: rotate(349.2deg); + -moz-transform: rotate(349.2deg); + -ms-transform: rotate(349.2deg); + -o-transform: rotate(349.2deg); + transform: rotate(349.2deg); +} +.c100.p98 .bar { + -webkit-transform: rotate(352.8deg); + -moz-transform: rotate(352.8deg); + -ms-transform: rotate(352.8deg); + -o-transform: rotate(352.8deg); + transform: rotate(352.8deg); +} +.c100.p99 .bar { + -webkit-transform: rotate(356.40000000000003deg); + -moz-transform: rotate(356.40000000000003deg); + -ms-transform: rotate(356.40000000000003deg); + -o-transform: rotate(356.40000000000003deg); + transform: rotate(356.40000000000003deg); +} +.c100.p100 .bar { + -webkit-transform: rotate(360deg); + -moz-transform: rotate(360deg); + -ms-transform: rotate(360deg); + -o-transform: rotate(360deg); + transform: rotate(360deg); +} +.c100.dark { + background-color: #777777; +} +.c100.dark .bar, +.c100.dark .fill { + border-color: #c6ff00 !important; +} +.c100.dark > span { + color: #777777; +} +.c100.dark:after { + background-color: #666666; +} +.c100.dark:hover > span { + color: #c6ff00; +} +.c100.green .bar, +.c100.green .fill { + border-color: #4db53c !important; +} +.c100.green:hover > span { + color: #4db53c; +} +.c100.green.dark .bar, +.c100.green.dark .fill { + border-color: #5fd400 !important; +} +.c100.green.dark:hover > span { + color: #5fd400; +} +.c100.orange .bar, +.c100.orange .fill { + border-color: #dd9d22 !important; +} +.c100.orange:hover > span { + color: #dd9d22; +} +.c100.orange.dark .bar, +.c100.orange.dark .fill { + border-color: #e08833 !important; +} +.c100.orange.dark:hover > span { + color: #e08833; +} Index: lams_central/web/includes/javascript/jqGrid.confidenceLevelFormattter.js =================================================================== diff -u --- lams_central/web/includes/javascript/jqGrid.confidenceLevelFormattter.js (revision 0) +++ lams_central/web/includes/javascript/jqGrid.confidenceLevelFormattter.js (revision bbe9589ceab063d62380b9fe3f02648a4581e109) @@ -0,0 +1,34 @@ +//confidence level column formatter function for jqGrid +function gradientNumberFormatter (cellvalue) { + var MIN_DATA_VALUE = 0, + MAX_DATA_VALUE = 10; + + var dataAsNumber = parseInt(cellvalue, 10); + if (dataAsNumber == -1) { + return ""; + } + if (dataAsNumber > MAX_DATA_VALUE) { + dataAsNumber = MAX_DATA_VALUE; + } + if (dataAsNumber < MIN_DATA_VALUE) { + dataAsNumber = MIN_DATA_VALUE; + } + var procents = (dataAsNumber - MIN_DATA_VALUE) * 100 / (MAX_DATA_VALUE - MIN_DATA_VALUE); + var gradientClass; + switch (true) { + case (procents < 40): + gradientClass = "gradient-red"; + break; + case (procents >= 40 && procents <= 60): + gradientClass = "gradient-orange"; + break; + default: + gradientClass = "gradient-green"; + break; + } + + return '
' + + $.fmatter.util.NumberFormat(cellvalue, $.jgrid.formatter["integer"]) + + '
'; +}; \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java =================================================================== diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -rbbe9589ceab063d62380b9fe3f02648a4581e109 --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java (.../ToolSessionManager.java) (revision d1d97d8c7da9ec5a96332afba14fa04970882bf9) +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java (.../ToolSessionManager.java) (revision bbe9589ceab063d62380b9fe3f02648a4581e109) @@ -26,6 +26,7 @@ import java.util.List; import java.util.SortedMap; +import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; @@ -156,6 +157,14 @@ * @return */ List getToolOutputs(String name, Long toolContentId); + + /** + * Returns confidence levels indicated by learners when answering questions. By now this feature is supported only by Assessment and MCQ tools. + * + * @param toolSessionId + * @return + */ + List getConfidenceLevels(Long toolSessionId); /** * Notifies tool that the user is force completed. Currently it's been utilized only by leader aware tools, which Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java =================================================================== diff -u -rb7de687cc7c54815ea555bb7674ef5b104e1c619 -rbbe9589ceab063d62380b9fe3f02648a4581e109 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java (.../ILamsCoreToolService.java) (revision b7de687cc7c54815ea555bb7674ef5b104e1c619) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java (.../ILamsCoreToolService.java) (revision bbe9589ceab063d62380b9fe3f02648a4581e109) @@ -26,6 +26,7 @@ import java.util.List; import java.util.SortedMap; +import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.lesson.Lesson; @@ -270,6 +271,14 @@ */ SortedMap getOutputFromTool(List names, ToolSession toolSession, Integer learnerId) throws ToolException; + + /** + * Returns confidence levels indicated by learners when answering questions. By now this feature is supported only by Assessment and MCQ tools. + * + * @param toolSession + * @return + */ + List getConfidenceLevelsByToolSession(ToolSession toolSession); /** * Notifies tool that the user is force completed. Currently it's been utilized only by leader aware tools, which Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java =================================================================== diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -rbbe9589ceab063d62380b9fe3f02648a4581e109 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java (.../ILamsToolService.java) (revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java (.../ILamsToolService.java) (revision bbe9589ceab063d62380b9fe3f02648a4581e109) @@ -23,8 +23,11 @@ package org.lamsfoundation.lams.tool.service; import java.io.IOException; +import java.util.List; import java.util.Set; +import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; +import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.tool.IToolVO; import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.ToolSession; @@ -123,6 +126,25 @@ * Returns leaders' userIds for all tool sessions from the given Leader Selection Tool. */ Set getLeaderUserId(Long leaderSelectionActivityId); + + /** + * Returns all activities that precede specified activity and produce confidence levels. + * + * @param toolContentId toolContentId of the specified activity + * @return + */ + Set getPrecedingConfidenceLevelsActivities(Long toolContentId); + + /** + * Returns confidence levels from the specified activity. + * + * @param activityUiid activityUiid of the activity with confidence levels + * @param requestorUserId userId of the requesting user. we need it in order to get confidence level providing tool's sessionId + * @param requestorToolSessionId toolSessionId of the activity that calls this method + * @return + */ + List getConfidenceLevelsByActivity(Integer confidenceLevelActivityUiid, Integer requestorUserId, + Long requestorToolSessionId); /** * Get a count of all the users that would be returned by getUsersForActivity(Long toolSessionId); Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java =================================================================== diff -u -r463716d6023591c9c35eeb5057a16c903289029e -rbbe9589ceab063d62380b9fe3f02648a4581e109 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java (.../LamsCoreToolService.java) (revision 463716d6023591c9c35eeb5057a16c903289029e) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java (.../LamsCoreToolService.java) (revision bbe9589ceab063d62380b9fe3f02648a4581e109) @@ -30,6 +30,7 @@ import java.util.TreeSet; import org.apache.log4j.Logger; +import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.ActivityEvaluation; import org.lamsfoundation.lams.learningdesign.ComplexActivity; @@ -530,7 +531,39 @@ throw new ToolException(message, e); } } + + @Override + public List getConfidenceLevelsByToolSession(ToolSession toolSession) { + + if (toolSession == null) { + String error = "The toolSession is null. Unable to get confidence levels"; + LamsCoreToolService.log.error(error); + throw new DataMissingException(error); + } + Tool tool = toolSession.getToolActivity().getTool(); + if (tool == null) { + String error = "The tool for toolSession " + toolSession.getToolSessionId() + " is missing."; + LamsCoreToolService.log.error(error); + throw new DataMissingException(error); + } + + try { + ToolSessionManager sessionManager = (ToolSessionManager) findToolService(tool); + return sessionManager.getConfidenceLevels(toolSession.getToolSessionId()); + } catch (NoSuchBeanDefinitionException e) { + String message = "A tool which is defined in the database appears to missing from the classpath. Unable to get the tool output. toolActivity " + + toolSession.getToolActivity().getActivityId(); + LamsCoreToolService.log.error(message, e); + throw new ToolException(message, e); + } catch (java.lang.AbstractMethodError e) { + String message = "Tool " + tool.getToolDisplayName() + + " doesn't support the getToolOutput(name, toolSessionId, learnerId) method so no output definitions can be accessed."; + LamsCoreToolService.log.error(message, e); + throw new ToolException(message, e); + } + } + @Override public void forceCompleteActivity(ToolSession toolSession, User learner) throws ToolException { Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java =================================================================== diff -u -r463716d6023591c9c35eeb5057a16c903289029e -rbbe9589ceab063d62380b9fe3f02648a4581e109 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision 463716d6023591c9c35eeb5057a16c903289029e) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision bbe9589ceab063d62380b9fe3f02648a4581e109) @@ -24,7 +24,10 @@ package org.lamsfoundation.lams.tool.service; import java.io.IOException; +import java.lang.reflect.Field; +import java.lang.reflect.Method; import java.util.Date; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -34,6 +37,7 @@ import org.apache.log4j.Logger; import org.hibernate.Hibernate; import org.hibernate.proxy.HibernateProxy; +import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; import org.lamsfoundation.lams.gradebook.service.IGradebookService; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.ActivityEvaluation; @@ -43,14 +47,17 @@ import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO; import org.lamsfoundation.lams.lesson.CompletedActivityProgress; import org.lamsfoundation.lams.lesson.LearnerProgress; +import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.service.ILessonService; import org.lamsfoundation.lams.tool.IToolVO; import org.lamsfoundation.lams.tool.Tool; +import org.lamsfoundation.lams.tool.ToolContent; import org.lamsfoundation.lams.tool.ToolOutput; import org.lamsfoundation.lams.tool.ToolSession; import org.lamsfoundation.lams.tool.dao.IToolContentDAO; import org.lamsfoundation.lams.tool.dao.IToolDAO; import org.lamsfoundation.lams.tool.dao.IToolSessionDAO; +import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.util.FileUtil; import org.lamsfoundation.lams.util.FileUtilException; @@ -67,6 +74,9 @@ // Leader selection tool Constants private static final String LEADER_SELECTION_TOOL_OUTPUT_NAME_LEADER_USERID = "leader.user.id"; + + private static final String TOOL_SIGNATURE_ASSESSMENT = "laasse10"; + private static final String TOOL_SIGNATURE_MCQ = "lamc11"; private IActivityDAO activityDAO; private IAuditService auditService; @@ -267,7 +277,7 @@ return activity; } - //in case of floating activity + //in case of a floating activity } else if (activityClass.equals(FloatingActivity.class)) { LearnerProgress learnerProgress = lessonService.getUserProgressForLesson(userId, lessonId); Map completedActivities = learnerProgress.getCompletedActivities(); @@ -312,8 +322,108 @@ return null; } + + @Override + public Set getPrecedingConfidenceLevelsActivities(Long toolContentId) { + ToolActivity specifiedActivity = activityDAO.getToolActivityByToolContentId(toolContentId); + + //if specifiedActivity is null - most likely author hasn't saved the sequence yet + if (specifiedActivity == null) { + return null; + } + + Set confidenceProvidingActivityIds = new LinkedHashSet(); + findPrecedingConfidenceProvidingActivities(specifiedActivity, confidenceProvidingActivityIds); + + Set confidenceProvidingActivities = new LinkedHashSet(); + for (Long confidenceProvidingActivityId : confidenceProvidingActivityIds) { + ToolActivity confidenceProvidingActivity = (ToolActivity) activityDAO.getActivityByActivityId(confidenceProvidingActivityId, ToolActivity.class); + confidenceProvidingActivities.add(confidenceProvidingActivity); + } + return confidenceProvidingActivities; + } + + /** + * Finds all preceding activities that can provide confidence levels (currently only Assessment and MCQ provide + * them). Please note, it does not check whether enableConfidenceLevels advanced option is ON in those activities. + */ + @SuppressWarnings("rawtypes") + private void findPrecedingConfidenceProvidingActivities(Activity activity, Set confidenceProvidingActivityIds) { + // check if current activity is Leader Select one. if so - stop searching and return it. + Class activityClass = Hibernate.getClass(activity); + if (activityClass.equals(ToolActivity.class)) { + ToolActivity toolActivity; + + // activity is loaded as proxy due to lazy loading and in order to prevent quering DB we just re-initialize + // it here again + Hibernate.initialize(activity); + if (activity instanceof HibernateProxy) { + toolActivity = (ToolActivity) ((HibernateProxy) activity).getHibernateLazyInitializer() + .getImplementation(); + } else { + toolActivity = (ToolActivity) activity; + } + + String toolSignature = toolActivity.getTool().getToolSignature(); + if (TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature) || TOOL_SIGNATURE_MCQ.equals(toolSignature)) { + confidenceProvidingActivityIds.add(toolActivity.getActivityId()); + } + + //in case of a floating activity - return all available confidence providing activities + } else if (activityClass.equals(FloatingActivity.class)) { + Set activities = activity.getLearningDesign().getActivities(); + for (Activity activityIter : activities) { + if (activityIter instanceof ToolActivity) { + String toolSignatureIter = ((ToolActivity) activityIter).getTool().getToolSignature(); + if (TOOL_SIGNATURE_ASSESSMENT.equals(toolSignatureIter) + || TOOL_SIGNATURE_MCQ.equals(toolSignatureIter)) { + confidenceProvidingActivityIds.add(activityIter.getActivityId()); + } + } + } + return; + } + + // check previous activity + Transition transitionTo = activity.getTransitionTo(); + if (transitionTo != null) { + Activity fromActivity = transitionTo.getFromActivity(); + findPrecedingConfidenceProvidingActivities(fromActivity, confidenceProvidingActivityIds); + return; + } + + // check parent activity + Activity parent = activity.getParentActivity(); + if (parent != null) { + findPrecedingConfidenceProvidingActivities(parent, confidenceProvidingActivityIds); + return; + } + } + @Override + public List getConfidenceLevelsByActivity(Integer confidenceLevelActivityUiid, Integer requestorUserId, + Long requestorToolSessionId) { + User user = (User) activityDAO.find(User.class, requestorUserId); + if (user == null) { + throw new ToolException("No user found for userId=" + requestorUserId); + } + + ToolSession requestorSession = toolSessionDAO.getToolSession(requestorToolSessionId); + if (requestorSession == null) { + throw new ToolException("No session found for toolSessionId=" + requestorToolSessionId); + } + + Activity confidenceLevelActivity = activityDAO.getActivityByUIID(confidenceLevelActivityUiid, + requestorSession.getToolActivity().getLearningDesign()); + ToolSession confidenceLevelSession = toolSessionDAO.getToolSessionByLearner(user, confidenceLevelActivity); + + List confidenceLevelDtos = lamsCoreToolService.getConfidenceLevelsByToolSession(confidenceLevelSession); + + return confidenceLevelDtos; + } + + @Override public Integer getCountUsersForActivity(Long toolSessionId) { ToolSession session = toolSessionDAO.getToolSession(toolSessionId); return session.getLearners().size(); Index: lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml =================================================================== diff -u -rfa3eff32270a8fc08855e99726b4ff318d60bf09 -rbbe9589ceab063d62380b9fe3f02648a4581e109 --- lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml (.../Scratchie.hbm.xml) (revision fa3eff32270a8fc08855e99726b4ff318d60bf09) +++ lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml (.../Scratchie.hbm.xml) (revision bbe9589ceab063d62380b9fe3f02648a4581e109) @@ -150,6 +150,15 @@ insert="true" column="time_limit" /> + + + +
@@ -35,6 +44,37 @@
+ +
+ +
+ +
+ + + +
Index: lams_tool_scratchie/web/pages/authoring/authoring.jsp =================================================================== diff -u -r9e9c0664745d48fdd504952bb279e5b840675758 -rbbe9589ceab063d62380b9fe3f02648a4581e109 --- lams_tool_scratchie/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision 9e9c0664745d48fdd504952bb279e5b840675758) +++ lams_tool_scratchie/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision bbe9589ceab063d62380b9fe3f02648a4581e109) @@ -1,31 +1,39 @@ - <%@ include file="/common/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.tool.scratchie.ScratchieConstants"%> - <fmt:message key="label.author.title" /> <%@ include file="/common/tabbedheader.jsp"%> + Index: lams_tool_scratchie/web/pages/learning/burningQuestions.jsp =================================================================== diff -u -rc9759e81d08842b6202f62bc08a78cc13ca5bcf8 -rbbe9589ceab063d62380b9fe3f02648a4581e109 --- lams_tool_scratchie/web/pages/learning/burningQuestions.jsp (.../burningQuestions.jsp) (revision c9759e81d08842b6202f62bc08a78cc13ca5bcf8) +++ lams_tool_scratchie/web/pages/learning/burningQuestions.jsp (.../burningQuestions.jsp) (revision bbe9589ceab063d62380b9fe3f02648a4581e109) @@ -16,24 +16,24 @@ <fmt:message key="label.learning.title" /> <%@ include file="/common/header.jsp"%> -#scratches tr td { - padding: 12px 15px; -} - -#scratches a, #scratches a:hover { - border-bottom: none; -} - -.scartchie-image { - border: 0; -} - - - + Index: lams_tool_scratchie/web/pages/learning/questionlist.jsp =================================================================== diff -u -r55ce2e8e7dc351b8d21dcc2c0aa4b79aadc3d73b -rbbe9589ceab063d62380b9fe3f02648a4581e109 --- lams_tool_scratchie/web/pages/learning/questionlist.jsp (.../questionlist.jsp) (revision 55ce2e8e7dc351b8d21dcc2c0aa4b79aadc3d73b) +++ lams_tool_scratchie/web/pages/learning/questionlist.jsp (.../questionlist.jsp) (revision bbe9589ceab063d62380b9fe3f02648a4581e109) @@ -1,11 +1,12 @@ <%@ include file="/common/taglibs.jsp"%> - + + + <%-- param has higher level for request attribute --%> - @@ -103,7 +104,8 @@ - + + - +
+ + @@ -123,15 +125,50 @@ id="image-${item.uid}-${answer.uid}" /> - + + +
${answer.attemptOrder}
- 		class="answer-with-confidence-level-portrait" + > + + + +
+ + +
+ + + +
+ + + + + + +
+
+
+
+
+ ${confidenceLevelDto.level}0% +
+
+ + +
+ +