ADAM / AIAHTML5

Commit d232e5ca46a86436e6fd4eefe6964e4bc75f26d4

Authored by Amrita Vishnoi
1 parent fd2f03cd

At module files along with few procedures which need to be merge in develop but … 

…now they will merge when AT will merge in develop
Inline Side-by-side
Showing 3 changed files with 43 additions and 1 deletions
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
  View file @d232e5c
... ... @@ -1060,6 +1060,7 @@
1060 1060 <Content Include="content\data\json\cb\SlideShow\The_Skeletal_System.json" />
1061 1061 <Content Include="content\data\json\cb\SlideShow\The_Special_Senses.json" />
1062 1062 <Content Include="content\data\json\cb\SlideShow\The_Urinary_System.json" />
  1063 + <Content Include="content\data\json\at\at_question_filter.json" />
1063 1064 <None Include="content\data\json\da\body-views\10\da_dat_tm_sg_10.json" />
1064 1065 <Content Include="content\data\json\da\body-views\12\da_dat_layer_12.json" />
1065 1066 <Content Include="content\data\json\da\body-views\12\da_dat_tm_sg_12.json" />
... ...
400-SOURCECODE/AIAHTML5.Web/content/data/json/at/at_question_filter.json 0 → 100644
  View file @d232e5c
  1 +{
  2 + "root": {
  3 + "it": [
  4 + {
  5 + "_Id": "23",
  6 + "_tl": "Head and Neck",
  7 + "_ti": "at_tni_23.jpg"
  8 + },
  9 + {
  10 + "_Id": "24",
  11 + "_tl": "Upper Limb",
  12 + "_ti": "at_tni_24.jpg"
  13 + },
  14 + {
  15 + "_Id": "25",
  16 + "_tl": "Body Wall and Back",
  17 + "_ti": "at_tni_25.jpg"
  18 + },
  19 + {
  20 + "_Id": "26",
  21 + "_tl": "Thorax",
  22 + "_ti": "at_tni_26.jpg"
  23 + },
  24 + {
  25 + "_Id": "27",
  26 + "_tl": "Abdomen",
  27 + "_ti": "at_tni_27.jpg"
  28 + },
  29 + {
  30 + "_Id": "28",
  31 + "_tl": "Pelvis and Perineum",
  32 + "_ti": "at_tni_28.jpg"
  33 + },
  34 + {
  35 + "_Id": "29",
  36 + "_tl": "Lower Limb",
  37 + "_ti": "at_tni_29.jpg"
  38 + }
  39 + ]
  40 + }
  41 +}
0 42 \ No newline at end of file
... ...
500-DBDump/AIA-StoredProcedures/ADMIN-ANGULAR-VERSION-PROCS/dbo.usp_GetSiteLicenseUsageReport.sql renamed to 500-DBDump/AIA-StoredProcedures/ADMIN-ANGULAR-VERSION-PROCS/dbo.usp_GetSiteLicenseUsageReports.sql
  View file @d232e5c
... ... @@ -20,7 +20,7 @@ BEGIN
20 20 SELECT @dtFromDate = CONVERT(DATETIME,@sFromDate)
21 21 SELECT @dtToDate = DATEADD(ms,-3,DATEADD(DAY,1,CONVERT(DATETIME,@sToDate)))
22 22  
23   - Select RowNum,AccountNumber, EditionTitle, ReferalUrl, InstitutionName, LicenseCreationDate,TotalLogins,LastLogin
  23 + Select RowNum as 'Serial_No',AccountNumber, EditionTitle, ReferalUrl, InstitutionName, LicenseCreationDate,TotalLogins,LastLogin
24 24 from (
25 25 SELECT ROW_NUMBER() OVER (ORDER BY UserLoginLog.AccountNumber) AS RowNum , UserLoginLog.AccountNumber, Edition.Title AS EditionTitle, UserLoginLog.ReferalUrl,
26 26 (SELECT License.InstitutionName FROM License WHERE License.AccountNumber = UserLoginLog.AccountNumber) as InstitutionName,
... ...