diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/GetViewsHtml.aspx.cs b/trunk/SiprpWebFichasClinicas/WebContent/static/html/GetViewsHtml.aspx.cs deleted file mode 100644 index b079095a..00000000 --- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/GetViewsHtml.aspx.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace siprp -{ - public partial class GetViewsHtml : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - Response.Write(GenerateHtml()); - } - - /// - /// reads all html files from app folder and puts it inside property htmlString - /// - /// - public static string GenerateHtml() - { - string[] htmlFiles = System.IO.Directory.GetFiles(HttpContext.Current.Server.MapPath("~/app"), "*.html", System.IO.SearchOption.AllDirectories); - StringBuilder sb = new StringBuilder(); - foreach (string file in htmlFiles) - { - System.IO.StreamReader htmlFile = new System.IO.StreamReader(file); - string html = htmlFile.ReadToEnd(); - - sb.AppendLine(html); - - htmlFile.Close(); - htmlFile.Dispose(); - } - - var htmlString = sb.ToString(); - - //compress html - var compressor = new ZetaHtmlCompressor.HtmlContentCompressor(); - htmlString = compressor.Compress(htmlString); - - return htmlString; - } - - - - - - - - } -} \ No newline at end of file diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/AngularAdmin.v11.suo b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/AngularAdmin.v11.suo deleted file mode 100644 index 4a9b8712..00000000 Binary files a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/AngularAdmin.v11.suo and /dev/null differ diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/main.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/main.js index 727068c1..134fb922 100644 --- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/main.js +++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/main.js @@ -24,7 +24,7 @@ $(function(){ // ---> views-all.html // ---> GetViewsHtml.aspx - $.get('../../rs/fichasclinicas/getViews', function( data ) { + $.get(window.evoapp.CTXPATH + 'getViews', function( data ) { var body = $('body'); var viewCache = $('
'); diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/DataService.js b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/DataService.js index 91bd0861..99e25237 100644 --- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/DataService.js +++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/DataService.js @@ -1,6 +1,6 @@ evoapp.service('dataService', function ($rootScope, $http, $q, $timeout, modelService, $filter) { - var serviceBase = 'http://java1.evo.pt:8080/siprp_fichasclinicas/rs/fichasclinicas/'; + var serviceBase = window.evoapp.CTXPATH;//'http://java1.evo.pt:8080/siprp_fichasclinicas/rs/fichasclinicas/'; var record = function(model){ diff --git a/trunk/SiprpWebFichasClinicas/WebContent/static/html/index.html b/trunk/SiprpWebFichasClinicas/WebContent/static/html/index.html index 6a15d649..5543c3c5 100644 --- a/trunk/SiprpWebFichasClinicas/WebContent/static/html/index.html +++ b/trunk/SiprpWebFichasClinicas/WebContent/static/html/index.html @@ -80,7 +80,7 @@