git-svn-id: https://svn.coded.pt/svn/SIPRP@1904 bb69d46d-e84e-40c8-a05a-06db0d633741

trunk/SiprpWebFichasClinicas/WebContent/static/html/GetViewsHtml.aspx.cs

@@ -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());
-        }
-
-        /// <summary>
-        /// reads all html files from app folder and puts it inside property htmlString
-        /// </summary>
-        /// <returns></returns>
-        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;
-        }
-
-
-
-
-
-
-
-    }
-}

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 = $('<div id="view-cache"></div>');

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){
         

trunk/SiprpWebFichasClinicas/WebContent/static/html/index.html

@@ -80,7 +80,7 @@
     <script src="app/Documents/DocumentsController.js"></script>
 
     <script>    
-    window.evoapp.CTXPATH = "<%=request.getContextPath()%>";
+    window.evoapp.CTXPATH = "<%=request.getContextPath()%>/rs/fichasclinicas/";
     </script> 
 
 </head>