mariusz.pacek/meeter
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
Mariusz Pacek authored and mar committed 2014-12-10 23:49:25 +01:00
1 parent a7def7a928
commit d4ec82f506
3 files changed
+73 -48
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.idea/vcs.xml
Generated
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/meeter" vcs="Git" />
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
.idea/workspace.xml
Generated
+71 -46
View File
@@ -2,8 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="5d6a2593-8c2d-4db7-9e34-c28cb2e8f44a" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/meeter/LICENSE" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/meeter/README.md" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/RoomModel.scala" afterPath="$PROJECT_DIR$/app/models/RoomModel.scala" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="play-slick-quickstart.iws" />
<ignored path=".idea/workspace.xml" />
@@ -80,16 +81,6 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="mainLogin.scala.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/mainLogin.scala.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-27.416666" vertical-offset="32" max-vertical-offset="1035">
<caret line="46" column="40" selection-start-line="46" selection-start-column="40" selection-end-line="46" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="errorPage.scala.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/errorPage.scala.html">
<provider selected="true" editor-type-id="text-editor">
@@ -100,16 +91,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="room.scala.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/room.scala.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="150">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="4" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="unauthorized.scala.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/unauthorized.scala.html">
<provider selected="true" editor-type-id="text-editor">
@@ -153,16 +134,36 @@
</provider>
</entry>
</file>
<file leaf-file-name="README.md" pinned="false" current-in-tab="true">
<file leaf-file-name="README.md" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.091883615" vertical-offset="0" max-vertical-offset="653">
<state vertical-scroll-proportion="-2.4" vertical-offset="0" max-vertical-offset="150">
<caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Permission.scala" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/models/Permission.scala">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240">
<caret line="6" column="25" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="RoomModel.scala" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/models/RoomModel.scala">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.48672566" vertical-offset="0" max-vertical-offset="1380">
<caret line="24" column="21" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="editSurvey.scala.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/editSurvey.scala.html">
<provider selected="true" editor-type-id="text-editor">
@@ -191,12 +192,13 @@
</FindUsagesManager>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/meeter" />
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/app/views/index.scala.html" />
<option value="$PROJECT_DIR$/app/models/RoomModel.scala" />
</list>
</option>
</component>
@@ -349,6 +351,28 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="play-slick-quickstart" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="play-slick-quickstart" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="models" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="RoomModel.scala" />
<option name="myItemType" value="org.jetbrains.plugins.scala.components.ScalaDefsProjectViewProvider$ScalaFileTreeNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="play-slick-quickstart" />
@@ -816,12 +840,12 @@
<workItem from="1418206628679" duration="1093000" />
<workItem from="1418230493093" duration="855000" />
<workItem from="1418232258605" duration="92000" />
<workItem from="1418232398849" duration="8152000" />
<workItem from="1418232398849" duration="9149000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="230454000" />
<option name="totallyTimeSpent" value="231451000" />
</component>
<component name="ToolWindowManager">
<frame x="1919" y="27" width="1922" height="1174" extended-state="6" />
@@ -1102,13 +1126,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/models/Permission.scala">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240">
<caret line="6" column="25" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/assets/css/styles.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="525">
@@ -1140,17 +1157,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/models/RoomModel.scala">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="375" max-vertical-offset="1380">
<caret line="59" column="45" selection-start-line="59" selection-start-column="40" selection-end-line="59" selection-end-column="45" />
<folding />
</state>
</provider>
<provider editor-type-id="com.intellij.database.editor.CsvTableFileEditorProvider">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/controllers/Application.scala">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-12.678572" vertical-offset="2990" max-vertical-offset="4155">
@@ -1260,12 +1266,31 @@
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.091883615" vertical-offset="0" max-vertical-offset="653">
<state vertical-scroll-proportion="-2.4" vertical-offset="0" max-vertical-offset="150">
<caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/models/Permission.scala">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240">
<caret line="6" column="25" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/models/RoomModel.scala">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.48672566" vertical-offset="0" max-vertical-offset="1380">
<caret line="24" column="21" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="21" />
<folding />
</state>
</provider>
<provider editor-type-id="com.intellij.database.editor.CsvTableFileEditorProvider">
<state />
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
app/models/RoomModel.scala
+1 -1
View File
@@ -22,7 +22,7 @@ case class RoomData(survey: SurveyRoom, user: UserData)
case class Message(email: String, message: String)
/* Table mapping
/* Table mapping test
*/
class UserDataTable(tag: Tag) extends Table[UserData](tag, "USER") {