Changeset 588

Timestamp:

03/22/07 05:58:12 (2 years ago)

Author:

jarmo

Message:

• Removed references to form categories, data type tags and asset condition analysis from the manual.
  
• TaskController? tests are now fixture free but not complete. Seems like the best option is to rewrite
  all tests at once because the old ones are bad and messy. Fixtures shouldn't be used for anything.
  

Files:

• branches/baseline/app/controllers/task_controller.rb (modified) (1 diff)
• branches/baseline/db/migrate/002_initial_data.rb (modified) (1 diff)
• branches/baseline/doc/manual/latex/tex/reference_manual.tex (modified) (7 diffs)
• branches/baseline/test/functional/task_controller_test.rb (modified) (2 diffs)
• branches/baseline/test/test_helper.rb (modified) (2 diffs)

branches/baseline/app/controllers/task_controller.rb

@@ -319 +319 @@
-  end
-
-  def update_states
-    raise params.inspect
-  end
-
-  def remove
-    common_remove(Task, 'short_description', :action => 'list' ) { |instance|

branches/baseline/db/migrate/002_initial_data.rb

@@ -7 +7 @@
-class InitialData < ActiveRecord::Migration
-  def self.up
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-

branches/baseline/doc/manual/latex/tex/reference_manual.tex

@@ -298 +298 @@
-The Search function can be used to find forms matching the given criteria: chosen form types, time span and keywords.
-
-grouped according to the form categories they belong  to, 
+
-%\paragraph{Help}
-%See Online help~\ref{subsec:online_help}.
@@ -413 +413 @@
-\item \textbf{Name}: Name of the asset type. The name of an asset type is shown for example in the asset information view for an asset of that type.
-\item \textbf{Icon}: Icon is used to mark the asset type and all assets belonging to the asset type.
-% This feature is available since 1.2
-\item \textbf{Typical maintenance time interval}: Typical time interval between successive maintenance operations for assets of this type --- Optional field. Used when assets condition is monitored and analysed.
-%
-\item \textbf{Description}: Description  and other information for the asset type. Description fields use a simple markup language that enables you to include headers, lists and other elements in the description --- See \ref{subsec:markup_language} for details.
-\end{itemize}
@@ -461 +458 @@
-\begin{itemize}
-\item \textbf{Name}: Name of the task type
-\item \textbf{Tag}: Data type tag for the task type --- See \ref{subsec:data_type_tags} for data type tags
-\item \textbf{Description}: Description of the task  type
-\end{itemize}
@@ -519 +515 @@
-\item \texttt{cmms\_form\_creation\_date}: Creation time of the form
-\item \texttt{cmms\_form\_type\_name}: Name for the type of the form
-\item \texttt{cmms\_form\_category\_name}: Name for the category of the form
-\item All common automatic fields listed in \ref{:subsubsec:user_fields}
-\end{itemize}
@@ -527 +522 @@
-You can create a new form type by following the instructions in this sub-section.
-\paragraph{Step 1 of 4}
-form category and enter 
+
-\paragraph{Step 2 of 4}
-Select Open Document template file for the form type.
@@ -537 +532 @@
-% FIXME
-To be continued\ldots
-
-\subsection{Form categories}
-\label{subsec:form_categories}
-Form categories are used to organize form types. Each form type has to belong to a form category. By associating similar form types to a same form category you can keep your form types in good order.
-
-You could for example have a form category 'Maintenance X' and form types 'Annual maintenance' and 'Preventive maintenance' could belong to this category.
-
-Each form category has three fields:
-\begin{itemize}
-\item \textbf{Name}: Name for the form category
-\item \textbf{Tag}: Data type tag for the form category --- See \ref{subsec:data_type_tags} for data type tags
-% This might be removed in future versions!
-\item \textbf{Parent}: Parent category for the form category
-\end{itemize}
-
-\subsubsection{Functions in the Form categories menu}
-You can manage your form categories with these functions.
-\paragraph{List}
-Shows a list of form categories. Existing form categories can be edited with the 'Edit' action in the 'Actions' column and removed by performing the 'Remove' action on selected form categories.
-\paragraph{Create}
-You can create a new form category by using the Create function. Form category is created by filling out the fields in the creation form and by selecting the 'Create' button.
-
-\subsection{Access control}
@@ -806 +780 @@
-In addition to these automatic user fields, both task and form type have their own automatic user fields. See \ref{subsec:task_types} and \ref{subsec:form_types} for the additional automatic fields.
-
-\subsection{Data type tags --- Tagging tasks and forms}
-\label{subsec:data_type_tags}
-Data type tags are used to tag tasks and forms in different task types and form categories. You can tag tasks and forms by setting the 'Tag' field in task types and form categories. All tasks in a tagged task type and all forms in form types in a tagged form category inherit the tag from their data type.
-
-\subsubsection{Tag chains}
-The tags constitute tag chains, which are used to model maintenance processes. Information gathered this way is used to monitor and analyse condition of assets. Currently NorfelloCMMS OS has two tag chains 'Service request' and 'Maintenance', which are documented below.
-
-\paragraph{Service request}
-Service request tag chain models the process:
-\begin{center}
-\framebox[1.07\width]{Service request form $\longrightarrow$ Service task $\longrightarrow$  Condition form}
-\end{center}
-When a form is created to a form category tagged as 'Service request form', it is expected to lead to a task whose type is tagged as 'Service task'. When the service task is completed, user is expected to file a form to a category tagged as 'Condition form'.
-
-An example of this kind of process is 'Failure report $\rightarrow$ Repair task $\rightarrow$ Condition report', where for example a client files a 'Failure report' form on an asset, which leads to creation of a 'Repair' task for the asset and after the task has been performed by a user, she files a 'Condition report' form.
-
-\paragraph{Maintenance}
-Maintenance tag chain models the process:
-\begin{center}
-\framebox[1.1\width]{Maintenance task $\longrightarrow$  Maintenance form}
-\end{center}
-When a task is created  to a task type tagged as 'Maintenance task', it is expected that after the task is completed, a form is created to a form category tagged as 'Maintenance form'.
-
-This tag chain represents any maintenance task that is required to lead to filing of a form, once the job is done. The resulting form can for example be any kind of maintenance report (e.g. an accounting of work) or a condition report. Use of imagination is recommended.
-
-\subsubsection{Using the tags}
-Task types and form categories can be tagged by setting their 'Tag' field. When a task or a form is expected to lead to creation of a form or a task, there is a 'Create form' or a 'Create task' link in the task or form viewing page. The expected data can be created by following these links.
-
-\subsubsection{Asset condition monitor}
-Information about assets condition is shown in the 'Condition monitor' found in the asset information viewing page, unless there is nothing to be shown. In the 'Condition monitor' you can see if there is tagged information, that requires users attention, in the selected asset. If the selected asset has a type and the asset type has the typical maintenance time interval defined, the 'Condition monitor' will also show the estimated maintenance need.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

branches/baseline/test/functional/task_controller_test.rb

@@ -6 +6 @@
-
-class TaskControllerTest < Test::Unit::TestCase
-  fixtures :users, :keyrings, :keyrings_users, :action_keys, :action_keys_keyrings,
-           :assets, :form_types, :forms,
-           :task_types, :tasks, :data_permissions,
-           :assets, :user_groups, :user_groups_users, :assets_user_groups,
-           :data_permission_profiles, :attachments
-
-  def setup
-    @controller = TaskController.new
@@ -17 +11 @@
-    @response   = ActionController::TestResponse.new
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    get 'create'
-    assert_response :success
-    assert_template 'task/create'
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    now = Time.now
-
-
-"task_type_id" => task_type_
-"short_description" => "Test task"
-"long_description" => "This is a test task."
-"priority" => "4"
-"starting_time_field"
-"deadline_field"
-"estimated_working_time"
-
+ 
+  
+  'task_type_id' => @test_type.
+  'short_description' => 'Test task'
+  'long_description' => 'This is a test task.'
+  'priority' => '4'
+  'starting_time_field'
+  'deadline_field'
+  'estimated_working_time'
+  
-    assert_response :redirect
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    assert_response :redirect
-    assert_redirected_to :action => 'list'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-