Merge pull request #31 from psteiwer/dev

Dev
psteiwer · Jul 23, 2019 · 15c9bd1 · 15c9bd1
2 parents f882505 + ee58241
commit 15c9bd1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 173 deletions.
diff --git a/AnalyzeThis/Installer.cls b/AnalyzeThis/Installer.cls
@@ -1,15 +1,13 @@
 Class AnalyzeThis.Installer
 {
 
-ClassMethod RunInstaller()
+ClassMethod RunInstaller(pRootDir)
 {
 	Set tSC=$$$OK
 
-	Read "Enter AnalyzeThis root directory: ",tRootDir,!
-
-	If tRootDir'="" {
-		Do $system.OBJ.LoadDir(tRootDir_"/AnalyzeThis","ck",,1)
-		Set tSC=..ImportImage(tRootDir_"/Assets/AnalyzeThis_BookCover.png")
+	If pRootDir'="" {
+		Do $system.OBJ.LoadDir(pRootDir_"/AnalyzeThis","ck",,1)
+		Set tSC=..ImportImage(pRootDir_"/Assets/AnalyzeThis_BookCover.png")
 		If $$$ISERR(tSC) Quit
 	}
 

diff --git a/AnalyzeThis/UI/CSVImport.cls b/AnalyzeThis/UI/CSVImport.cls
@@ -22,167 +22,6 @@ Property canWritePage As %ZEN.Datatype.boolean [ InitialExpression = 1 ];
 /// If true, user can modify this particular listing group.
 Property canWrite As %ZEN.Datatype.boolean [ InitialExpression = 1 ];
 
-/// This Style block contains page-specific CSS style definitions.
-XData Style
-{
-<style type="text/css">
-.ribbonTitle {
-	color: #404040;
-	background: rgb(147,191,252);
-}
-
-.dynaGridWrapper {
-	border: 1px solid #808080;
-}
-
-#command_cmdRemove {
-	background: rgb(141,53,53);
-}
-
-body {
-	background: #F8F8F8;
-}
-
-.dgCellInner {
-	font-size: 12pt;
-}
-
-.zenLabel, .checkboxCaption {
-	color: #404040;
-	font-size: 10pt;
-}
-.zenLabelDisabled {
-	color: #808080;
-	font-size: 10pt;
-}
-
-.zenHint {
-	color: #606060;
-	font-size: 8pt;
-}
-
-#editGroup {
-	opacity: 0.0;
-	-webkit-transition-property: opacity;
-	-webkit-transition-duration: 0.5s;
-	-webkit-transition-timing-function: ease;
-	-moz-transition-property: opacity;
-	-moz-transition-duration: 0.5s;
-	-moz-transition-timing-function: ease;
-}
-
-#propertyGroup {
-	position: relative;
-	width: 320px;
-	opacity: 0.0;
-	-webkit-transition-property: opacity;
-	-webkit-transition-duration: 0.5s;
-	-webkit-transition-timing-function: ease;
-	-moz-transition-property: opacity;
-	-moz-transition-duration: 0.5s;
-	-moz-transition-timing-function: ease;
-
-	border-left: 1px solid #808080;
-	border-right: 1px solid #808080;
-	border-bottom: 1px solid #808080;
-	overflow: auto;
-	background: #f6f8f9; /* Old browsers */
-	background: -moz-linear-gradient(-45deg,  #f6f8f9 0%, #e5ebee 50%, #d7dee3 51%, #f5f7f9 100%); /* FF3.6+ */
-	background: -webkit-gradient(linear, left top, right bottom, color-stop(0%,#f6f8f9), color-stop(50%,#e5ebee), color-stop(51%,#d7dee3), color-stop(100%,#f5f7f9)); /* Chrome,Safari4+ */
-	background: -webkit-linear-gradient(-45deg,  #f6f8f9 0%,#e5ebee 50%,#d7dee3 51%,#f5f7f9 100%); /* Chrome10+,Safari5.1+ */
-	background: -o-linear-gradient(-45deg,  #f6f8f9 0%,#e5ebee 50%,#d7dee3 51%,#f5f7f9 100%); /* Opera 11.10+ */
-	background: -ms-linear-gradient(-45deg,  #f6f8f9 0%,#e5ebee 50%,#d7dee3 51%,#f5f7f9 100%); /* IE10+ */
-	background: linear-gradient(-45deg,  #f6f8f9 0%,#e5ebee 50%,#d7dee3 51%,#f5f7f9 100%); /* W3C */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f6f8f9', endColorstr='#f5f7f9',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */
-}
-
-.gridLabel {
-	color: #808080;
-	padding: 3px;
-	font-size: 24px;
-}
-
-#help {
-	padding: 10px;
-	font-size: 12px;
-	color: #606060;
-}
-
-#termList {
-	width: 500px;
-	height: 200px;
-	border: 10px solid #E0E0E0;
-	border-radius: 5px;
-}
-
-.termItemEven {
-	width: 100%;
-	background: #F8F8F8;
-	color: #404040;
-	font-family: arial;
-	border-bottom: 1px solid #D0D0D0;
-}
-
-.termItemOdd {
-	width: 100%;
-	color: #404040;
-	font-family: arial;
-	border-bottom: 1px solid #D0D0D0;
-}
-
-.tlHeader {
-	position: relative;
-	height: 40px;
-	vertical-align: middle;
-	border-bottom: 1px solid white;
-	padding: 4px;
-	background: #808080;
-	color: #F0F0F0;
-	font-size: 10pt;
-	font-weight: bold;
-}
-
-.tlBody {
-	position: absolute;
-	top: 40px;
-	bottom: 0px;
-	left:0px;
-	right: 0px;
-	background: #D0D0D0;
-}
-
-.tlItem,
-.tlItemSelected {
-	position: relative;
-	padding: 4px;
-	height: 25px;
-	vertical-align: middle;
-	font-size: 20px;
-	color: #404040;
-	background: #F0F0F0;
-	border-bottom: 1px solid #D0D0D0;
-}
-
-.tlItemSelected {
-	color: #F0F0F0;
-	background: rgb(53,107,141);
-}
-
-.tlItem:hover {
-	background: #E8E8E8;
-}
-
-.dynaTreeNode {
-	white-space: nowrap;
-	font-size: 10pt;
-}
-
-.dynaTreeItem {
-	color: rgb(71,72,67);
-}
-</style>
-}
-
 XData contentPane [ XMLNamespace = "http://www.intersystems.com/zen" ]
 {
 <pane xmlns="http://www.intersystems.com/zen">

diff --git a/AnalyzeThis/UI/Dialog/CSVImport.cls b/AnalyzeThis/UI/Dialog/CSVImport.cls
@@ -135,7 +135,7 @@ XData dialogBody [ XMLNamespace = "http://www.intersystems.com/zen" ]
 
 <group id="SourceClass" hidden="true">
 <hgroup id="cubeProp" valign="top">
-<text id="sourceClass" label="Source Class" size="70" required="true" hint="Required. This class must already exist." onchange="zenPage.UpdateSource(zenThis.getValue()); zenPage.updateState();"/>
+<text id="sourceClass" label="Source Class" size="70" required="false" hint="Required. This class must already exist." onchange="zenPage.UpdateSource(zenThis.getValue()); zenPage.updateState();"/>
 <button caption="Browse..." onclick="zenPage.browseClass('sourceClass');" />
 </hgroup>
 </group>
@@ -795,7 +795,9 @@ ClientMethod onloadHandler() [ Internal, Language = javascript ]
 {
 	this.invokeSuper('onloadHandler',arguments);
 	if (this.InvalidParam) {
-		zen("btnNext").setHidden(true);	}
+		zen("btnNext").setHidden(true);
+	}
+	this.onstartHandler();
 }
 
 ClientMethod getDialogValue() [ Internal, Language = javascript ]
@@ -1230,20 +1232,26 @@ Method SwitchSourceType() As %Status [ZenMethod]
 		// Hide others
 		Set sourceSQL.hidden=1
 		Set sourceClass.hidden=1
+
+		Set sourceClassFile.required=0
 	} ElseIf sourceType.value="SQL" {
 		// Unhide SQL
 		Set sourceSQL.hidden=0
 
 		// Hide others
 		Set sourceCSV.hidden=1
 		Set sourceClass.hidden=1
+
+		Set sourceClassFile.required=0
 	} ElseIf sourceType.value="Class" {
 		// Unhide SQL
 		Set sourceClass.hidden=0
 
 		// Hide others
 		Set sourceCSV.hidden=1
 		Set sourceSQL.hidden=1
+
+		Set sourceClassFile.required=1
 	}
 
 	Quit st

diff --git a/README.md b/README.md
@@ -18,11 +18,11 @@ Provide a Data Source (CSV file, Caché Class, or SQL Query) and assign dimensio
 3. Open terminal and ZN to desired namespace
 4. Run the following commands:
 ```
-   do $system.OBJ.Load("<PATH FROM STEP 2>/AnalyzeThis/Installer.cls","ck")
-   do ##class(AnalyzeThis.Installer).RunInstaller()
+   Set path="PATH FROM STEP 2"
+   Do $system.OBJ.Load(path_"/AnalyzeThis/Installer.cls","ck")
+   Do ##class(AnalyzeThis.Installer).RunInstaller(path)
 ```
-5. When prompted, again enter path from step 2
-6. From the Management Portal, navigate to DeepSee/Analytics->User Portal
+5. From the Management Portal, navigate to DeepSee/Analytics->User Portal
    * Find new "AnalyzeThis" Link with custom Cover Image
 
    ![alt text][logo]