subj_sub_models 0.0.3.16 → 0.0.3.17
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.idea/workspace.xml +248 -34
- data/lib/subj_models/brand.rb +1 -0
- data/lib/subj_models/event_schedule.rb +1 -1
- data/lib/subj_models/like.rb +11 -0
- data/lib/subj_models/user.rb +3 -0
- data/lib/subj_models/user_specialization.rb +1 -0
- data/lib/subj_models/user_video.rb +74 -0
- data/lib/subj_models/version.rb +1 -1
- metadata +5 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d02d23a73f00e5a9af20f62cdc5055ae4a933a8a
|
|
4
|
+
data.tar.gz: b16585096878b1743396d80dfd9e1ce9ff7a1b5a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a9c7320329a12de11cb9c0e0eaa1745c5a06eeda0ea210ec4c07a4c2d323cd2e731ecc16ee14f67c112cb945951cd7ad0dc764cd3edc45f79c59458a47cb53e6
|
|
7
|
+
data.tar.gz: f7d0032d188f0070687132a321684c971162c6a01c9bb5b54eaa69f3a404beaeebc895b16061685b28e9e45f4ab25b35e5ca83e3db5c3571d8a0ba118aa56c85
|
data/.idea/workspace.xml
CHANGED
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
<component name="ChangeListManager">
|
|
4
4
|
<list default="true" id="df7164a7-6c43-42fd-8a2b-5000b47cabac" name="Default" comment="">
|
|
5
5
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
6
|
-
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/subj_models/version.rb" afterPath="$PROJECT_DIR$/lib/subj_models/version.rb" />
|
|
7
6
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subj_models.iml" afterPath="$PROJECT_DIR$/subj_models.iml" />
|
|
8
7
|
</list>
|
|
9
8
|
<ignored path="subj_models.iws" />
|
|
@@ -25,28 +24,28 @@
|
|
|
25
24
|
</component>
|
|
26
25
|
<component name="FileEditorManager">
|
|
27
26
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
28
|
-
<file leaf-file-name=".
|
|
29
|
-
<entry file="file://$PROJECT_DIR
|
|
27
|
+
<file leaf-file-name="brand.rb" pinned="false" current-in-tab="false">
|
|
28
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/brand.rb">
|
|
30
29
|
<provider selected="true" editor-type-id="text-editor">
|
|
31
|
-
<state relative-caret-position="
|
|
32
|
-
<caret line="
|
|
30
|
+
<state relative-caret-position="150">
|
|
31
|
+
<caret line="10" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
|
|
33
32
|
<folding />
|
|
34
33
|
</state>
|
|
35
34
|
</provider>
|
|
36
35
|
</entry>
|
|
37
36
|
</file>
|
|
38
|
-
<file leaf-file-name="
|
|
39
|
-
<entry file="file://$PROJECT_DIR$/lib/subj_models/
|
|
37
|
+
<file leaf-file-name="brand_line.rb" pinned="false" current-in-tab="false">
|
|
38
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/brand_line.rb">
|
|
40
39
|
<provider selected="true" editor-type-id="text-editor">
|
|
41
|
-
<state relative-caret-position="
|
|
42
|
-
<caret line="
|
|
40
|
+
<state relative-caret-position="0">
|
|
41
|
+
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
43
42
|
<folding />
|
|
44
43
|
</state>
|
|
45
44
|
</provider>
|
|
46
45
|
</entry>
|
|
47
46
|
</file>
|
|
48
|
-
<file leaf-file-name="
|
|
49
|
-
<entry file="file://$PROJECT_DIR$/lib/subj_models/
|
|
47
|
+
<file leaf-file-name="category.rb" pinned="false" current-in-tab="false">
|
|
48
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/category.rb">
|
|
50
49
|
<provider selected="true" editor-type-id="text-editor">
|
|
51
50
|
<state relative-caret-position="0">
|
|
52
51
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
@@ -55,8 +54,48 @@
|
|
|
55
54
|
</provider>
|
|
56
55
|
</entry>
|
|
57
56
|
</file>
|
|
58
|
-
<file leaf-file-name="
|
|
59
|
-
<entry file="file://$PROJECT_DIR$/lib/subj_models/
|
|
57
|
+
<file leaf-file-name="like.rb" pinned="false" current-in-tab="false">
|
|
58
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/like.rb">
|
|
59
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
60
|
+
<state relative-caret-position="75">
|
|
61
|
+
<caret line="5" column="7" lean-forward="false" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="7" />
|
|
62
|
+
<folding />
|
|
63
|
+
</state>
|
|
64
|
+
</provider>
|
|
65
|
+
</entry>
|
|
66
|
+
</file>
|
|
67
|
+
<file leaf-file-name="user.rb" pinned="false" current-in-tab="false">
|
|
68
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/user.rb">
|
|
69
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
70
|
+
<state relative-caret-position="-946">
|
|
71
|
+
<caret line="34" column="8" lean-forward="false" selection-start-line="34" selection-start-column="8" selection-end-line="34" selection-end-column="8" />
|
|
72
|
+
<folding />
|
|
73
|
+
</state>
|
|
74
|
+
</provider>
|
|
75
|
+
</entry>
|
|
76
|
+
</file>
|
|
77
|
+
<file leaf-file-name="user_specialization.rb" pinned="false" current-in-tab="false">
|
|
78
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/user_specialization.rb">
|
|
79
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
80
|
+
<state relative-caret-position="375">
|
|
81
|
+
<caret line="26" column="0" lean-forward="false" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
|
|
82
|
+
<folding />
|
|
83
|
+
</state>
|
|
84
|
+
</provider>
|
|
85
|
+
</entry>
|
|
86
|
+
</file>
|
|
87
|
+
<file leaf-file-name="user_video.rb" pinned="false" current-in-tab="false">
|
|
88
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/user_video.rb">
|
|
89
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
90
|
+
<state relative-caret-position="390">
|
|
91
|
+
<caret line="55" column="11" lean-forward="true" selection-start-line="55" selection-start-column="11" selection-end-line="55" selection-end-column="11" />
|
|
92
|
+
<folding />
|
|
93
|
+
</state>
|
|
94
|
+
</provider>
|
|
95
|
+
</entry>
|
|
96
|
+
</file>
|
|
97
|
+
<file leaf-file-name="user_work_place.rb" pinned="false" current-in-tab="false">
|
|
98
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/user_work_place.rb">
|
|
60
99
|
<provider selected="true" editor-type-id="text-editor">
|
|
61
100
|
<state relative-caret-position="0">
|
|
62
101
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
@@ -69,7 +108,17 @@
|
|
|
69
108
|
<entry file="file://$PROJECT_DIR$/lib/subj_models/version.rb">
|
|
70
109
|
<provider selected="true" editor-type-id="text-editor">
|
|
71
110
|
<state relative-caret-position="15">
|
|
72
|
-
<caret line="1" column="21" lean-forward="false" selection-start-line="1" selection-start-column="
|
|
111
|
+
<caret line="1" column="21" lean-forward="false" selection-start-line="1" selection-start-column="21" selection-end-line="1" selection-end-column="21" />
|
|
112
|
+
<folding />
|
|
113
|
+
</state>
|
|
114
|
+
</provider>
|
|
115
|
+
</entry>
|
|
116
|
+
</file>
|
|
117
|
+
<file leaf-file-name="video.rb" pinned="false" current-in-tab="false">
|
|
118
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/video.rb">
|
|
119
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
120
|
+
<state relative-caret-position="300">
|
|
121
|
+
<caret line="20" column="5" lean-forward="true" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" />
|
|
73
122
|
<folding />
|
|
74
123
|
</state>
|
|
75
124
|
</provider>
|
|
@@ -77,6 +126,11 @@
|
|
|
77
126
|
</file>
|
|
78
127
|
</leaf>
|
|
79
128
|
</component>
|
|
129
|
+
<component name="FindInProjectRecents">
|
|
130
|
+
<findStrings>
|
|
131
|
+
<find>parent_id_scope</find>
|
|
132
|
+
</findStrings>
|
|
133
|
+
</component>
|
|
80
134
|
<component name="Git.Settings">
|
|
81
135
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
82
136
|
</component>
|
|
@@ -89,6 +143,12 @@
|
|
|
89
143
|
<option name="CHANGED_PATHS">
|
|
90
144
|
<list>
|
|
91
145
|
<option value="$PROJECT_DIR$/lib/subj_models/specialist_activity.rb" />
|
|
146
|
+
<option value="$PROJECT_DIR$/lib/subj_models/event_schedule.rb" />
|
|
147
|
+
<option value="$PROJECT_DIR$/lib/subj_models/user_video.rb" />
|
|
148
|
+
<option value="$PROJECT_DIR$/lib/subj_models/user_specialization.rb" />
|
|
149
|
+
<option value="$PROJECT_DIR$/lib/subj_models/user.rb" />
|
|
150
|
+
<option value="$PROJECT_DIR$/lib/subj_models/brand.rb" />
|
|
151
|
+
<option value="$PROJECT_DIR$/lib/subj_models/like.rb" />
|
|
92
152
|
<option value="$PROJECT_DIR$/lib/subj_models/version.rb" />
|
|
93
153
|
</list>
|
|
94
154
|
</option>
|
|
@@ -104,6 +164,25 @@
|
|
|
104
164
|
<option name="width" value="1440" />
|
|
105
165
|
<option name="height" value="873" />
|
|
106
166
|
</component>
|
|
167
|
+
<component name="ProjectInspectionProfilesVisibleTreeState">
|
|
168
|
+
<entry key="Project Default">
|
|
169
|
+
<profile-state>
|
|
170
|
+
<expanded-state>
|
|
171
|
+
<State>
|
|
172
|
+
<id />
|
|
173
|
+
</State>
|
|
174
|
+
<State>
|
|
175
|
+
<id>Ruby</id>
|
|
176
|
+
</State>
|
|
177
|
+
</expanded-state>
|
|
178
|
+
<selected-state>
|
|
179
|
+
<State>
|
|
180
|
+
<id>RubyInterpreter</id>
|
|
181
|
+
</State>
|
|
182
|
+
</selected-state>
|
|
183
|
+
</profile-state>
|
|
184
|
+
</entry>
|
|
185
|
+
</component>
|
|
107
186
|
<component name="ProjectView">
|
|
108
187
|
<navigator currentView="ProjectPane" proportions="" version="1">
|
|
109
188
|
<flattenPackages />
|
|
@@ -119,6 +198,8 @@
|
|
|
119
198
|
<foldersAlwaysOnTop value="true" />
|
|
120
199
|
</navigator>
|
|
121
200
|
<panes>
|
|
201
|
+
<pane id="Scratches" />
|
|
202
|
+
<pane id="Scope" />
|
|
122
203
|
<pane id="ProjectPane">
|
|
123
204
|
<subPane>
|
|
124
205
|
<expand>
|
|
@@ -146,8 +227,6 @@
|
|
|
146
227
|
<select />
|
|
147
228
|
</subPane>
|
|
148
229
|
</pane>
|
|
149
|
-
<pane id="Scope" />
|
|
150
|
-
<pane id="Scratches" />
|
|
151
230
|
<pane id="PackagesPane" />
|
|
152
231
|
</panes>
|
|
153
232
|
</component>
|
|
@@ -156,6 +235,11 @@
|
|
|
156
235
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
157
236
|
<property name="HbShouldOpenHtmlAsHb" value="" />
|
|
158
237
|
</component>
|
|
238
|
+
<component name="RecentsManager">
|
|
239
|
+
<key name="CopyFile.RECENT_KEYS">
|
|
240
|
+
<recent name="$PROJECT_DIR$/lib/subj_models" />
|
|
241
|
+
</key>
|
|
242
|
+
</component>
|
|
159
243
|
<component name="RunDashboard">
|
|
160
244
|
<option name="ruleStates">
|
|
161
245
|
<list>
|
|
@@ -269,25 +353,29 @@
|
|
|
269
353
|
<updated>1474965845268</updated>
|
|
270
354
|
<workItem from="1474965862769" duration="101000" />
|
|
271
355
|
<workItem from="1506009777241" duration="27000" />
|
|
272
|
-
<workItem from="1506009853470" duration="
|
|
356
|
+
<workItem from="1506009853470" duration="889000" />
|
|
357
|
+
<workItem from="1506030000160" duration="2842000" />
|
|
273
358
|
</task>
|
|
274
359
|
<servers />
|
|
275
360
|
</component>
|
|
276
361
|
<component name="TimeTrackingManager">
|
|
277
|
-
<option name="totallyTimeSpent" value="
|
|
362
|
+
<option name="totallyTimeSpent" value="4597000" />
|
|
278
363
|
</component>
|
|
279
364
|
<component name="ToolWindowManager">
|
|
280
365
|
<frame x="0" y="23" width="1440" height="873" extended-state="0" />
|
|
281
366
|
<editor active="true" />
|
|
282
367
|
<layout>
|
|
283
|
-
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.
|
|
368
|
+
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26037195" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
284
369
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
285
370
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
|
286
371
|
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
287
|
-
<window_info id="
|
|
372
|
+
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
373
|
+
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32961586" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
374
|
+
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32934928" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
288
375
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
289
376
|
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
290
377
|
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
|
378
|
+
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
291
379
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
|
292
380
|
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
293
381
|
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
|
@@ -297,14 +385,11 @@
|
|
|
297
385
|
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
|
298
386
|
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
299
387
|
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
300
|
-
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
301
388
|
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
302
389
|
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
303
390
|
<window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
304
391
|
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
305
392
|
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
|
306
|
-
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32934928" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
307
|
-
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
308
393
|
</layout>
|
|
309
394
|
</component>
|
|
310
395
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -336,6 +421,46 @@
|
|
|
336
421
|
<watches-manager />
|
|
337
422
|
</component>
|
|
338
423
|
<component name="editorHistoryManager">
|
|
424
|
+
<entry file="file://$PROJECT_DIR$/.gitignore">
|
|
425
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
426
|
+
<state relative-caret-position="195">
|
|
427
|
+
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
|
|
428
|
+
<folding />
|
|
429
|
+
</state>
|
|
430
|
+
</provider>
|
|
431
|
+
</entry>
|
|
432
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/specialist_activity.rb">
|
|
433
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
434
|
+
<state relative-caret-position="480">
|
|
435
|
+
<caret line="32" column="3" lean-forward="false" selection-start-line="32" selection-start-column="3" selection-end-line="32" selection-end-column="3" />
|
|
436
|
+
<folding />
|
|
437
|
+
</state>
|
|
438
|
+
</provider>
|
|
439
|
+
</entry>
|
|
440
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/specialist_activity_document_type.rb">
|
|
441
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
442
|
+
<state relative-caret-position="0">
|
|
443
|
+
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
444
|
+
<folding />
|
|
445
|
+
</state>
|
|
446
|
+
</provider>
|
|
447
|
+
</entry>
|
|
448
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/user_specialization_approval.rb">
|
|
449
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
450
|
+
<state relative-caret-position="0">
|
|
451
|
+
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
452
|
+
<folding />
|
|
453
|
+
</state>
|
|
454
|
+
</provider>
|
|
455
|
+
</entry>
|
|
456
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/version.rb">
|
|
457
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
458
|
+
<state relative-caret-position="45">
|
|
459
|
+
<caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
|
|
460
|
+
<folding />
|
|
461
|
+
</state>
|
|
462
|
+
</provider>
|
|
463
|
+
</entry>
|
|
339
464
|
<entry file="file://$PROJECT_DIR$/.gitignore">
|
|
340
465
|
<provider selected="true" editor-type-id="text-editor">
|
|
341
466
|
<state relative-caret-position="0">
|
|
@@ -434,13 +559,6 @@
|
|
|
434
559
|
</state>
|
|
435
560
|
</provider>
|
|
436
561
|
</entry>
|
|
437
|
-
<entry file="file://$PROJECT_DIR$/lib/subj_models/user_specialization.rb">
|
|
438
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
439
|
-
<state relative-caret-position="240">
|
|
440
|
-
<caret line="16" column="73" lean-forward="true" selection-start-line="16" selection-start-column="52" selection-end-line="16" selection-end-column="73" />
|
|
441
|
-
</state>
|
|
442
|
-
</provider>
|
|
443
|
-
</entry>
|
|
444
562
|
<entry file="file://$PROJECT_DIR$/bin/setup">
|
|
445
563
|
<provider selected="true" editor-type-id="text-editor">
|
|
446
564
|
<state relative-caret-position="0">
|
|
@@ -530,6 +648,22 @@
|
|
|
530
648
|
</state>
|
|
531
649
|
</provider>
|
|
532
650
|
</entry>
|
|
651
|
+
<entry file="file://$PROJECT_DIR$/.gitignore">
|
|
652
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
653
|
+
<state relative-caret-position="0">
|
|
654
|
+
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
|
|
655
|
+
<folding />
|
|
656
|
+
</state>
|
|
657
|
+
</provider>
|
|
658
|
+
</entry>
|
|
659
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/attribute_value.rb">
|
|
660
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
661
|
+
<state relative-caret-position="90">
|
|
662
|
+
<caret line="6" column="38" lean-forward="false" selection-start-line="6" selection-start-column="38" selection-end-line="6" selection-end-column="38" />
|
|
663
|
+
<folding />
|
|
664
|
+
</state>
|
|
665
|
+
</provider>
|
|
666
|
+
</entry>
|
|
533
667
|
<entry file="file://$PROJECT_DIR$/lib/subj_models/specialist_activity.rb">
|
|
534
668
|
<provider selected="true" editor-type-id="text-editor">
|
|
535
669
|
<state relative-caret-position="480">
|
|
@@ -538,10 +672,90 @@
|
|
|
538
672
|
</state>
|
|
539
673
|
</provider>
|
|
540
674
|
</entry>
|
|
541
|
-
<entry file="file://$PROJECT_DIR
|
|
675
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/event_schedule.rb">
|
|
542
676
|
<provider selected="true" editor-type-id="text-editor">
|
|
543
|
-
<state relative-caret-position="
|
|
544
|
-
<caret line="
|
|
677
|
+
<state relative-caret-position="165">
|
|
678
|
+
<caret line="11" column="37" lean-forward="false" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" />
|
|
679
|
+
<folding />
|
|
680
|
+
</state>
|
|
681
|
+
</provider>
|
|
682
|
+
</entry>
|
|
683
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/user_card.rb">
|
|
684
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
685
|
+
<state relative-caret-position="0">
|
|
686
|
+
<caret line="0" column="53" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="53" />
|
|
687
|
+
<folding />
|
|
688
|
+
</state>
|
|
689
|
+
</provider>
|
|
690
|
+
</entry>
|
|
691
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/video.rb">
|
|
692
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
693
|
+
<state relative-caret-position="300">
|
|
694
|
+
<caret line="20" column="5" lean-forward="true" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" />
|
|
695
|
+
<folding />
|
|
696
|
+
</state>
|
|
697
|
+
</provider>
|
|
698
|
+
</entry>
|
|
699
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/user_specialization.rb">
|
|
700
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
701
|
+
<state relative-caret-position="375">
|
|
702
|
+
<caret line="26" column="0" lean-forward="false" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
|
|
703
|
+
<folding />
|
|
704
|
+
</state>
|
|
705
|
+
</provider>
|
|
706
|
+
</entry>
|
|
707
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/user_work_place.rb">
|
|
708
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
709
|
+
<state relative-caret-position="0">
|
|
710
|
+
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
711
|
+
<folding />
|
|
712
|
+
</state>
|
|
713
|
+
</provider>
|
|
714
|
+
</entry>
|
|
715
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/user_video.rb">
|
|
716
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
717
|
+
<state relative-caret-position="390">
|
|
718
|
+
<caret line="55" column="11" lean-forward="true" selection-start-line="55" selection-start-column="11" selection-end-line="55" selection-end-column="11" />
|
|
719
|
+
<folding />
|
|
720
|
+
</state>
|
|
721
|
+
</provider>
|
|
722
|
+
</entry>
|
|
723
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/user.rb">
|
|
724
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
725
|
+
<state relative-caret-position="-946">
|
|
726
|
+
<caret line="34" column="8" lean-forward="false" selection-start-line="34" selection-start-column="8" selection-end-line="34" selection-end-column="8" />
|
|
727
|
+
<folding />
|
|
728
|
+
</state>
|
|
729
|
+
</provider>
|
|
730
|
+
</entry>
|
|
731
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/brand_line.rb">
|
|
732
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
733
|
+
<state relative-caret-position="0">
|
|
734
|
+
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
735
|
+
<folding />
|
|
736
|
+
</state>
|
|
737
|
+
</provider>
|
|
738
|
+
</entry>
|
|
739
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/category.rb">
|
|
740
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
741
|
+
<state relative-caret-position="0">
|
|
742
|
+
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
743
|
+
<folding />
|
|
744
|
+
</state>
|
|
745
|
+
</provider>
|
|
746
|
+
</entry>
|
|
747
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/brand.rb">
|
|
748
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
749
|
+
<state relative-caret-position="150">
|
|
750
|
+
<caret line="10" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
|
|
751
|
+
<folding />
|
|
752
|
+
</state>
|
|
753
|
+
</provider>
|
|
754
|
+
</entry>
|
|
755
|
+
<entry file="file://$PROJECT_DIR$/lib/subj_models/like.rb">
|
|
756
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
757
|
+
<state relative-caret-position="75">
|
|
758
|
+
<caret line="5" column="7" lean-forward="false" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="7" />
|
|
545
759
|
<folding />
|
|
546
760
|
</state>
|
|
547
761
|
</provider>
|
|
@@ -549,7 +763,7 @@
|
|
|
549
763
|
<entry file="file://$PROJECT_DIR$/lib/subj_models/version.rb">
|
|
550
764
|
<provider selected="true" editor-type-id="text-editor">
|
|
551
765
|
<state relative-caret-position="15">
|
|
552
|
-
<caret line="1" column="21" lean-forward="false" selection-start-line="1" selection-start-column="
|
|
766
|
+
<caret line="1" column="21" lean-forward="false" selection-start-line="1" selection-start-column="21" selection-end-line="1" selection-end-column="21" />
|
|
553
767
|
<folding />
|
|
554
768
|
</state>
|
|
555
769
|
</provider>
|
data/lib/subj_models/brand.rb
CHANGED
data/lib/subj_models/user.rb
CHANGED
|
@@ -30,6 +30,9 @@ module SubjModels
|
|
|
30
30
|
enum card_receive_type: CARD_RECEIVE_TYPES
|
|
31
31
|
|
|
32
32
|
|
|
33
|
+
has_many :user_videos, dependent: :destroy
|
|
34
|
+
has_many :likes, dependent: :destroy
|
|
35
|
+
has_many :liked_user_videos, -> { uniq }, through: :likes, source: :user_video
|
|
33
36
|
has_many :orders
|
|
34
37
|
has_many :notifications
|
|
35
38
|
has_many :user_specialization_approvals, dependent: :destroy
|
|
@@ -13,6 +13,7 @@ module SubjModels
|
|
|
13
13
|
has_and_belongs_to_many :users
|
|
14
14
|
has_and_belongs_to_many :access_groups
|
|
15
15
|
has_and_belongs_to_many :events
|
|
16
|
+
has_and_belongs_to_many :user_videos
|
|
16
17
|
|
|
17
18
|
has_many :specialist_activity_document_types, dependent: :destroy
|
|
18
19
|
has_many :user_specialization_approvals, dependent: :destroy
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
module SubjModels
|
|
2
|
+
|
|
3
|
+
module UserVideo
|
|
4
|
+
|
|
5
|
+
def self.included(including_class)
|
|
6
|
+
|
|
7
|
+
including_class.class_eval do
|
|
8
|
+
belongs_to :owner, class_name: 'User', foreign_key: :user_id
|
|
9
|
+
|
|
10
|
+
belongs_to :brand
|
|
11
|
+
has_and_belongs_to_many :user_specializations
|
|
12
|
+
|
|
13
|
+
has_many :likes, dependent: :destroy
|
|
14
|
+
has_many :liked_users, -> { uniq }, through: :likes, source: :user
|
|
15
|
+
|
|
16
|
+
validates_presence_of :title
|
|
17
|
+
validates_presence_of :brand
|
|
18
|
+
validates_presence_of :owner
|
|
19
|
+
|
|
20
|
+
has_attached_file :video_snapshot, default_url: '/images/default_video_snapshot.png', styles: { thumb: '300x300>' }
|
|
21
|
+
validates_attachment_content_type :video_snapshot, content_type: /\Aimage\/.*\z/
|
|
22
|
+
validates_attachment_size :video_snapshot, less_than: 10.megabytes
|
|
23
|
+
|
|
24
|
+
has_attached_file :full_video, default_url: ''
|
|
25
|
+
validates_attachment_content_type :full_video, content_type: /\Avideo\/.*\Z/
|
|
26
|
+
|
|
27
|
+
validates_attachment_size :full_video, less_than: 300.megabytes
|
|
28
|
+
|
|
29
|
+
has_attached_file :short_video, default_url: ''
|
|
30
|
+
validates_attachment_content_type :short_video, content_type: /\Avideo\/.*\Z/
|
|
31
|
+
validates_attachment_size :short_video, less_than: 100.megabytes
|
|
32
|
+
|
|
33
|
+
before_full_video_post_process :rename_full_video
|
|
34
|
+
before_short_video_post_process :rename_short_video
|
|
35
|
+
before_video_snapshot_post_process :rename_video_snapshot
|
|
36
|
+
end
|
|
37
|
+
end
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
def video_snapshot_url
|
|
41
|
+
video_snapshot&.url
|
|
42
|
+
end
|
|
43
|
+
|
|
44
|
+
def video_snapshot_thumb
|
|
45
|
+
video_snapshot&.url(:medium)
|
|
46
|
+
end
|
|
47
|
+
|
|
48
|
+
def full_video_url
|
|
49
|
+
full_video&.url
|
|
50
|
+
end
|
|
51
|
+
|
|
52
|
+
def short_video_url
|
|
53
|
+
short_video&.url
|
|
54
|
+
end
|
|
55
|
+
|
|
56
|
+
private
|
|
57
|
+
|
|
58
|
+
def rename_video_snapshot
|
|
59
|
+
extension = File.extname(video_snapshot_file_name).downcase
|
|
60
|
+
video_snapshot.instance_write :file_name, "#{SecureRandom.hex}#{extension}"
|
|
61
|
+
end
|
|
62
|
+
|
|
63
|
+
def rename_full_video
|
|
64
|
+
extension = File.extname(full_video_file_name).downcase
|
|
65
|
+
full_video.instance_write :file_name, "#{SecureRandom.hex}#{extension}"
|
|
66
|
+
end
|
|
67
|
+
|
|
68
|
+
def rename_short_video
|
|
69
|
+
extension = File.extname(short_video_file_name).downcase
|
|
70
|
+
short_video.instance_write :file_name, "#{SecureRandom.hex}#{extension}"
|
|
71
|
+
end
|
|
72
|
+
end
|
|
73
|
+
|
|
74
|
+
end
|
data/lib/subj_models/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: subj_sub_models
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.3.
|
|
4
|
+
version: 0.0.3.17
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- A.Nasa
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-09-
|
|
11
|
+
date: 2017-09-22 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|
|
@@ -74,6 +74,7 @@ files:
|
|
|
74
74
|
- lib/subj_models/event_type.rb
|
|
75
75
|
- lib/subj_models/faq.rb
|
|
76
76
|
- lib/subj_models/global_notification.rb
|
|
77
|
+
- lib/subj_models/like.rb
|
|
77
78
|
- lib/subj_models/manager.rb
|
|
78
79
|
- lib/subj_models/measure_unit.rb
|
|
79
80
|
- lib/subj_models/nomenclature.rb
|
|
@@ -108,6 +109,7 @@ files:
|
|
|
108
109
|
- lib/subj_models/user_delivery_address.rb
|
|
109
110
|
- lib/subj_models/user_specialization.rb
|
|
110
111
|
- lib/subj_models/user_specialization_approval.rb
|
|
112
|
+
- lib/subj_models/user_video.rb
|
|
111
113
|
- lib/subj_models/user_work_place.rb
|
|
112
114
|
- lib/subj_models/version.rb
|
|
113
115
|
- lib/subj_models/video.rb
|
|
@@ -142,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
142
144
|
version: '0'
|
|
143
145
|
requirements: []
|
|
144
146
|
rubyforge_project:
|
|
145
|
-
rubygems_version: 2.
|
|
147
|
+
rubygems_version: 2.5.1
|
|
146
148
|
signing_key:
|
|
147
149
|
specification_version: 4
|
|
148
150
|
summary: Move models from some project to gem.
|