ADAM / AIAHTML5

Commit e49ead4a4db3c765f074abf2293e1d4180ecf016

Authored by Amrita Vishnoi
1 parent c9c19891

after Merge Request #916, these changes are showing for commit

Inline Side-by-side
Showing 6 changed files with 16 additions and 173 deletions
400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html.orig deleted
View file @c9c1989
1   -<!--Body-->
2   -<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1/jquery-ui.min.js"></script>
3   -<div class="bodyWrap row" ng-controller="LabExercController">
4   -
5   -<<<<<<< HEAD
6   - <div class="" ng-init="GetQuizByTopic()">
7   - <div class="col-sm-12 pageHeading" id="LabExPageHeading">
8   -=======
9   - <div class="" ng-init="InitializeLabExercise()">
10   - <div class="col-sm-12 pageHeading">
11   ->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f
12   - <!--<button type="button" class="btn btn-default pull-left toggleBar hidden-lg"> <i class="fa fa-bars"></i> </button>
13   - <div class=" pull-left toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-bars"></i> </div>-->
14   - <h4 class="pull-left">Lab Exercise - {{LabExerciseName}}</h4>
15   - <div class="pull-right btn-group paddTop4"> <a href="#" class="btn btn-xs btn-default" ng-click="minLabExPanel()"><i class="fa fa-minus"></i></a> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-clone"></i></a> <a href="lab-exercises" ng-click="IsVisible()" class="btn btn-xs btn-default"><i class="fa fa-close"></i></a> </div>
16   - <div class="clearfix"></div>
17   - </div>
18   -
19   - <div class="col-sm-12">
20   - <div class="pull-left btn-group LabEx-Panel-state-minimized" id="LabExMinimizedId">
21   - <p class="pull-left" style="color:#fff">LAB Ex ...</p>
22   - <a href="#" class="btn btn-xs btn-default"><i class="fa fa-minus"></i></a> <a href="#" class="btn btn-xs btn-default" ng-click="maxLabExPanel()"><i class="fa fa-clone"></i></a> <a href="lab-exercises" ng-click="IsVisible()" class="btn btn-xs btn-default"><i class="fa fa-close"></i></a>
23   - </div>
24   - </div>
25   -
26   - <div class="col-sm-12">
27   -
28   - <div class="container-fluid main-full">
29   - <div class="row">
30   -<<<<<<< HEAD
31   - <div class="panel panel-default" id="labExPanel">
32   -=======
33   - <div class="panel panel-default" id="questionHtml">
34   ->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f
35   - <div class="panel-heading">
36   - {{activityTitle}}<p style="margin:-20px 474px -1px;" class="text-primary">{{Title}}</p>
37   - <div class="pull-right" style="margin: -20px 20px;">
38   - <p>Question <strong id="quizNo">{{quiznumber}}</strong> of {{TotalNumberofQuiz}}</p>
39   - </div>
40   - </div>
41   - <div class="panel-body" style="padding:2px;overflow:scroll">
42   - <div id="textblock" style="margin: 80px 20px; display block;">
43   - <div style="margin: 20px;" ng-repeat="optionbox in LabExerciseModules.OptionBox" droppable="true" class="droppable ui-droppable options" id="blockbox-{{optionbox.BoxName}}">
44   - <div ng-bind-html="deliberatelyTrustDangerousSnippet(optionbox.QuizText)"></div>
45   - </div>
46   - <!--<ul>
47   -<<<<<<< HEAD
48   - <li ng-repeat="optionbox in LabExerciseModules.OptionBox" droppable="true" ng-bind-html="'{{optionbox.QuizText}}' | to_trusted"></li>
49   - </ul>-->
50   -=======
51   - <li ng-repeat="optionbox in LabExerciseModules.OptionBox" droppable="true" ng-bind-html="'{{optionbox.QuizText}}' | to_trusted"></li>
52   - </ul>-->
53   ->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f
54   - </div>
55   - <div align="center" class="dragger">
56   - <div class="col-sm-1" style="padding-top: 150px; height: 500px; " id="divleft" droppable="true">
57   - <div draggable="true" ng-repeat="option in LabExerciseModules.Options | filter:{'textalign':'left'}" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'10px !important','float':'{{option.textalign}}'} " style="margin-bottom: 10px !important; width: 180px;" class="thumbnail caption col-sm-2 col-lg-3 ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div>
58   - </div>
59   - <div class="col-sm-9">
60   - <div style="position: relative; margin-left: 85px;" id="imgdiv">
61   - <div id="imgblock">
62   - <img id="droppable" ng-src="content/images/LE/{{Imagepath}}" alt="" ng-click="onClick()" imageonload />
63   - </div>
64   -
65   - <div ng-show="IsVisible" ng-repeat="optionbox in LabExerciseModules.OptionBox" droppable="true" class="droppable ui-droppable options" id="blockbox-{{optionbox.BoxName}}" ng-style="{'top':{{optionbox.topcoord}}, 'left':{{optionbox.leftcoord}},'position': 'absolute', 'width': '155px', 'height':'30px', 'border':'0px solid #333', 'background': '#E8E8E8' }">{{optionbox.Answervalue}}</div>
66   - <div draggable="true" ng-repeat="ans in DraggedList" droppable="true" class="droppable ui-droppable answerdroppable" id="blockans-{{ans.id}}" ng-style="{'top':{{ans.topcoord}}, 'left':{{ans.leftcoord}},'position': 'absolute', 'width': '158px', 'height':'30px', 'border':'0px solid #333', 'background': 'transparent','font-size': '12px','border-color':'#FF0000','padding-top':'5px'}">{{ans.Value}}</div>
67   - </div>
68   -
69   -<<<<<<< HEAD
70   - <div class="col-sm-12" style="margin-left: 200px; margin-top: 10px; height:80px;" id="divoptions" droppable="true">
71   -=======
72   - <div class="col-sm-12" style="margin-left: 215px; margin-top: 10px; height:80px;" id="divoptions" droppable="true">
73   ->>>>>>> d0fe2dca5c316aa0281ac40abe66d1137c1f4e7f
74   - <!--<div class="col-sm-3 col-lg-3 ui-draggable" >-->
75   - <div draggable="true" ng-repeat="option in LabExerciseModules.Options | filter:{'textalign':'bottom'}" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'5px !important','float':'{{option.textalign}}'} " style="margin-bottom: 5px !important; width: 180px;" class="thumbnail caption col-sm-2 col-lg-3 ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div>
76   - <!--</div>-->
77   - </div>
78   - </div>
79   - <div class="col-sm-1" style="padding-top: 150px; height: 500px; " id="divright" droppable="true">
80   - <div draggable="true" ng-repeat="option in LabExerciseModules.Options | filter:{'textalign':'right'}" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'10px !important','float':'{{option.textalign}}'} " style="margin-bottom: 10px !important; width: 180px;" class="thumbnail caption col-sm-2 col-lg-3 ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div>
81   - </div>
82   - </div>
83   - </div>
84   - <div class="panel-footer">
85   - <div class="pull-left">
86   - <!--<p>Question <strong>{{quiznumber}}</strong> of {{TotalNumberofQuiz}}</p>-->
87   - </div>
88   - <div class="pull-right">
89   - <div class="btn-group pull-left marginR5">
90   - <button class="btn btn-sm btn-primary" style="display:none;" ng-click="SubmitAttempt()" id="quizSubmitBtn">Submit</button>
91   - <button class="btn btn-sm btn-primary" style="display:none;" id="reportBtn" ng-click="ReportGen()">Report</button>
92   - <button class="btn btn-sm btn-primary" id="saveBtn" ng-click="SaveAnswer()">Save</button>
93   - <button class="btn btn-sm btn-primary" id="reviewBtn" ng-click="ReviewAttempt()">Review Your Attempt</button>
94   - <button class="btn btn-sm btn-primary" id="resetBtn" ng-click="OnResetClick()">Reset</button>
95   - </div>
96   - <div class="btn-group">
97   - <button class="btn btn-sm btn-black" ng-click="prevQuiz()"><i class="fa fa-arrow-left"></i></button>
98   - <button class="btn btn-sm btn-black" ng-click="nextQuiz()"><i class="fa fa-arrow-right"></i></button>
99   - </div>
100   - </div>
101   - <div class="clearfix"></div>
102   - </div>
103   -
104   - </div>
105   -
106   -
107   - <div class="panel panel-default" id="submitResultHtml" style="display:none;">
108   - <div class="panel-heading">
109   - <div class="row">
110   - <div class="col-sm-4 text-left"><strong>Cardiovascula System</strong></div>
111   - <div class="col-sm-4 text-center">Performace Report</div>
112   - <div class="col-sm-4 text-right">Score:{{scoreResult}}% </div>
113   - </div>
114   - </div>
115   - <div class="panel-body no-padding">
116   - <div class="row">
117   - <div class="col-sm-12 table-responsive ">
118   - <table class="table table-hover table-condensed bg-white">
119   - <thead>
120   - <tr class="active">
121   - <th class="text-center">Total Question</th>
122   - <th class="text-center">Correct Answers</th>
123   - <th class="text-center">Incorrect Answers</th>
124   - </tr>
125   - </thead>
126   - <tbody>
127   - <tr class="text-center">
128   - <td>{{TotalNumberofQuiz}}</td>
129   - <td>{{CorrectAnswer}}</td>
130   - <td>{{inCorrectAnswer}}</td>
131   - </tr>
132   - </tbody>
133   - </table>
134   -
135   - </div>
136   - <div class="col-sm-12 table-responsive">
137   - <table class="table table-hover table-condensed bg-white">
138   - <thead>
139   - <tr class="active">
140   - <th>Question</th>
141   - <th>Activity Title</th>
142   - <th>Status</th>
143   - <th>Action</th>
144   - </tr>
145   - </thead>
146   - <tbody id="resultLabData"></tbody>
147   - </table>
148   - </div>
149   - </div>
150   - </div>
151   - <div class="panel-footer">
152   - <div class="text-center">
153   - <button class="btn btn-sm btn-primary">
154   - Email
155   - </button>
156   -
157   - </div>
158   - <div class="clearfix"></div>
159   - </div>
160   -
161   - </div>
162   -
163   -
164   - </div>
165   - </div>
166   - </div>
167   -
168   -
169   -
170   - </div>
171   -</div>
172   -
173   -
500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql
  View file @e49ead4
1 1 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetDiscountReport.StoredProcedure.sql differ
... ...
500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql
  View file @e49ead4
1 1 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetExportedImageDetails.StoredProcedure.sql differ
... ...
500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql
  View file @e49ead4
1 1 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetNetAdSummaryReport.StoredProcedure.sql differ
... ...
500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql
  View file @e49ead4
1 1 Binary files a/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql and b/500-DBDump/AIA-StoredProcedures/dbo.GetSiteLicenseUsageReport.StoredProcedure.sql differ
... ...
500-DBDump/AIA-StoredProcedures/usp_GetProductEditionByLicense.sql 0 → 100644
  View file @e49ead4
  1 +
  2 +CREATE PROCEDURE [dbo].[usp_GetProductEditionByLicense]
  3 + -- Add the parameters for the stored procedure here
  4 + @iLicenseId int
  5 +AS
  6 +BEGIN
  7 + -- SET NOCOUNT ON added to prevent extra result sets from
  8 + -- interfering with SELECT statements.
  9 + SET NOCOUNT ON;
  10 + SELECT Edition.Id, Edition.Title, Edition.IsActive, Edition.Priority
  11 + FROM Edition
  12 + INNER JOIN LicenseToEdition ON Edition.Id = LicenseToEdition.EditionId
  13 + WHERE LicenseToEdition.LicenseId =@iLicenseId
  14 +END
  15 +
  16 +
... ...